diff --git a/xos/helloworldservice/admin.py b/xos/helloworldservice/admin.py
index 926fb4e..e6148be 100644
--- a/xos/helloworldservice/admin.py
+++ b/xos/helloworldservice/admin.py
@@ -1,19 +1,21 @@
-from django.contrib import admin
 
-from helloworldservice.models import HelloWorldService, HelloWorldTenant, HELLO_WORLD_KIND
-from django import forms
-from core.models import User
-from core.admin import SliceInline, ServiceAttrAsTabInline, ReadOnlyAwareAdmin, ServicePrivilegeInline
-
+from core.admin import ReadOnlyAwareAdmin, ServiceAttrAsTabInline, ServicePrivilegeInline, SliceInline
 from core.middleware import get_request
+from core.models import User
+from django import forms
+from django.contrib import admin
+from helloworldservice.models import HelloWorldService, HelloWorldTenant, HELLO_WORLD_KIND
+
 
 class HelloWorldServiceAdmin(ReadOnlyAwareAdmin):
     model = HelloWorldService
     verbose_name = "Hello World Service"
-    verbose_name_plural = "Hello World Service"
+    verbose_name_plural = "Hello World Services"
     list_display = ("backend_status_icon", "name", "enabled")
     list_display_links = ('backend_status_icon', 'name', )
-    fieldsets = [(None, {'fields': ['backend_status_text', 'name','enabled','versionNumber', 'description',"view_url","icon_url" ], 'classes':['suit-tab suit-tab-general']})]
+    fieldsets = [(None, {'fields': ['backend_status_text', 'name', 'enabled',
+                                    'versionNumber', 'description', "view_url"],
+                         'classes':['suit-tab suit-tab-general']})]
     readonly_fields = ('backend_status_text', )
     inlines = [SliceInline, ServiceAttrAsTabInline, ServicePrivilegeInline]
 
@@ -21,55 +23,60 @@
 
     user_readonly_fields = ["name", "enabled", "versionNumber", "description"]
 
-    suit_form_tabs =(('general', 'Hello World Service Details'),
-        ('administration', 'Administration'),
-        ('slices','Slices'),
-        ('serviceattrs','Additional Attributes'),
-        ('serviceprivileges','Privileges'),
-    )
+    suit_form_tabs = (('general', 'Hello World Service Details'),
+                      ('administration', 'Administration'),
+                      ('slices', 'Slices'),
+                      )
 
-    suit_form_includes = (('helloworldserviceadmin.html', 'top', 'administration'),
-                           )
+    suit_form_includes = (('helloworldserviceadmin.html',
+                           'top',
+                           'administration'),)
+
     def queryset(self, request):
         return HelloWorldService.get_service_objects_by_user(request.user)
 
+
 class HelloWorldTenantForm(forms.ModelForm):
     creator = forms.ModelChoiceField(queryset=User.objects.all())
     display_message = forms.CharField(required=False)
-    def __init__(self,*args,**kwargs):
-        super (HelloWorldTenantForm,self ).__init__(*args,**kwargs)
+
+    def __init__(self, *args, **kwargs):
+        super(HelloWorldTenantForm, self).__init__(*args, **kwargs)
         self.fields['kind'].widget.attrs['readonly'] = True
-        self.fields['provider_service'].queryset = HelloWorldService.get_service_objects().all()
+        self.fields[
+            'provider_service'].queryset = HelloWorldService.get_service_objects().all()
         if self.instance:
-            # fields for the attributes
             self.fields['creator'].initial = self.instance.creator
-	    self.fields['display_message'].initial = self.instance.display_message
+            self.fields[
+                'display_message'].initial = self.instance.display_message
+        self.fields['kind'].initial = HELLO_WORLD_KIND
         if (not self.instance) or (not self.instance.pk):
-            # default fields for an 'add' form
-            self.fields['kind'].initial = HELLO_WORLD_KIND
             self.fields['creator'].initial = get_request().user
             if HelloWorldService.get_service_objects().exists():
-               self.fields["provider_service"].initial = HelloWorldService.get_service_objects().all()[0]
-
+                self.fields["provider_service"].initial = HelloWorldService.get_service_objects().all()[
+                    0]
 
     def save(self, commit=True):
         self.instance.creator = self.cleaned_data.get("creator")
-	self.instance.display_message = self.cleaned_data.get("display_message")
+        self.instance.display_message = self.cleaned_data.get(
+            "display_message")
         return super(HelloWorldTenantForm, self).save(commit=commit)
 
     class Meta:
         model = HelloWorldTenant
 
+
 class HelloWorldTenantAdmin(ReadOnlyAwareAdmin):
     list_display = ('backend_status_icon', 'id', )
     list_display_links = ('backend_status_icon', 'id')
-    fieldsets = [ (None, {'fields': ['backend_status_text', 'kind', 'provider_service', 'service_specific_attribute',
-                                     'instance', 'creator', 'display_message'],
-                          'classes':['suit-tab suit-tab-general']})]
-    readonly_fields = ('backend_status_text', 'instance', 'service_specific_attribute', )
+    fieldsets = [(None, {'fields': ['backend_status_text', 'kind',
+                                    'provider_service', 'instance', 'creator',
+                                    'display_message'],
+                         'classes': ['suit-tab suit-tab-general']})]
+    readonly_fields = ('backend_status_text', 'instance',)
     form = HelloWorldTenantForm
 
-    suit_form_tabs = (('general','Details'),)
+    suit_form_tabs = (('general', 'Details'),)
 
     def queryset(self, request):
         return HelloWorldTenant.get_tenant_objects_by_user(request.user)