diff --git a/theses/models.py b/theses/models.py
index f8d878a6ae698090199343920bea4ae60541b552..37fcb52f07fd7f09fc90c3a53982bd18c9d162e8 100644
--- a/theses/models.py
+++ b/theses/models.py
@@ -18,103 +18,122 @@ thesis_type_dict = dict(THESIS_TYPES)
 
 class ThesisLink(models.Model):
     """ An URL pointing to a thesis """
-    requested_by = models.ForeignKey (Contributor, blank=True, null=True,
-                                      related_name='thesislink_requested_by',
-                                      on_delete=models.CASCADE)
+    requested_by = models.ForeignKey(
+        Contributor, blank=True, null=True,
+        related_name='thesislink_requested_by',
+        on_delete=models.CASCADE)
     vetted = models.BooleanField(default=False)
-    vetted_by = models.ForeignKey (Contributor, blank=True, null=True, on_delete=models.CASCADE)
+    vetted_by = models.ForeignKey(
+        Contributor, blank=True, null=True,
+        on_delete=models.CASCADE)
     type = models.CharField(max_length=3, choices=THESIS_TYPES)
-    discipline = models.CharField(max_length=20, choices=SCIPOST_DISCIPLINES, default='physics')
-    domain = models.CharField(max_length=3, choices=SCIPOST_JOURNALS_DOMAINS, blank=True)
-#    specialization = models.CharField(max_length=1, choices=SCIPOST_JOURNALS_SPECIALIZATIONS,
-#                                      blank=True)
-    subject_area = models.CharField(max_length=10, choices=SCIPOST_SUBJECT_AREAS, default='Phys:QP')
+    discipline = models.CharField(
+        max_length=20, choices=SCIPOST_DISCIPLINES,
+        default='physics')
+    domain = models.CharField(
+        max_length=3, choices=SCIPOST_JOURNALS_DOMAINS,
+        blank=True)
+    subject_area = models.CharField(
+        max_length=10,
+        choices=SCIPOST_SUBJECT_AREAS,
+        default='Phys:QP')
     open_for_commenting = models.BooleanField(default=True)
     title = models.CharField(max_length=300, verbose_name='title')
     pub_link = models.URLField(verbose_name='URL (external repository)')
     author = models.CharField(max_length=1000)
-    author_as_cont = models.ManyToManyField (Contributor, blank=True,
-                                             related_name='author_cont')
-    author_claims = models.ManyToManyField (Contributor, blank=True,
-                                            related_name='authors_thesis_claims')
-    author_false_claims = models.ManyToManyField (Contributor, blank=True,
-                                                  related_name='authors_thesis_false_claims')
+    author_as_cont = models.ManyToManyField(
+        Contributor, blank=True,
+        related_name='author_cont')
+    author_claims = models.ManyToManyField(
+        Contributor, blank=True,
+        related_name='authors_thesis_claims')
+    author_false_claims = models.ManyToManyField(
+        Contributor, blank=True,
+        related_name='authors_thesis_false_claims')
     supervisor = models.CharField(max_length=1000, default='')
-    supervisor_as_cont = models.ManyToManyField (Contributor, blank=True,
-                                                 verbose_name='supervisor(s)',
-                                                 related_name='supervisor_cont')
-    institution = models.CharField(max_length=300, verbose_name='degree granting institution')
+    supervisor_as_cont = models.ManyToManyField(
+        Contributor, blank=True,
+        verbose_name='supervisor(s)',
+        related_name='supervisor_cont')
+    institution = models.CharField(
+        max_length=300,
+        verbose_name='degree granting institution')
     defense_date = models.DateField(verbose_name='date of thesis defense')
     abstract = models.TextField(verbose_name='abstract, outline or summary')
     latest_activity = models.DateTimeField(default=timezone.now)
 
-    def __str__ (self):
+    def __str__(self):
         return self.title
 
-    def header_as_table (self):
-        context = Context({'title': self.title, 'author': self.author,
-                           'pub_link': self.pub_link, 'institution': self.institution,
-                           'supervisor': self.supervisor, 'defense_date': self.defense_date})
-        header = ('<table>'
-                  '<tr><td>Title: </td><td>&nbsp;</td><td>{{ title }}</td></tr>'
-                  '<tr><td>Author: </td><td>&nbsp;</td><td>{{ author }}</td></tr>'
-                  '<tr><td>As Contributor: </td><td>&nbsp;</td>')
+    def header_as_table(self):
+        context = Context({
+            'title': self.title, 'author': self.author,
+            'pub_link': self.pub_link, 'institution': self.institution,
+            'supervisor': self.supervisor, 'defense_date': self.defense_date})
+        header = (
+            '<table>'
+            '<tr><td>Title: </td><td>&nbsp;</td><td>{{ title }}</td></tr>'
+            '<tr><td>Author: </td><td>&nbsp;</td><td>{{ author }}</td></tr>'
+            '<tr><td>As Contributor: </td><td>&nbsp;</td>')
         if self.author_as_cont.all():
             for auth in self.author_as_cont.all():
-                header += ('<td><a href="/contributor/' + str(auth.id) + '">'
-                           + auth.user.first_name + ' ' + auth.user.last_name + '</a></td>')
+                header += (
+                    '<td><a href="/contributor/' + str(auth.id) + '">' +
+                    auth.user.first_name + ' ' + auth.user.last_name +
+                    '</a></td>')
         else:
             header += '<td>(not claimed)</td>'
-        header += ('</tr>'
-                   '<tr><td>Type: </td><td></td><td>' + thesis_type_dict[self.type] + '</td></tr>'
-                   '<tr><td>Discipline: </td><td></td><td>' + disciplines_dict[self.discipline]
-                   + '</td></tr>'
-                   '<tr><td>Domain: </td><td></td><td>' + journals_domains_dict[self.domain]
-                   + '</td></tr>'
-#                   '<tr><td>Specialization: </td><td></td><td>'
-#                   + journals_spec_dict[self.specialization] + '</td></tr>'
-                   '<tr><td>Subject area: </td><td></td><td>'
-                   + subject_areas_dict[self.subject_area] + '</td></tr>'
-                   '<tr><td>URL: </td><td>&nbsp;</td><td><a href="{{ pub_link }}" '
-                   'target="_blank">{{ pub_link }}</a></td></tr>'
-                   '<tr><td>Degree granting institution: </td><td>&nbsp;</td>'
-                   '<td>{{ institution }}</td></tr>'
-                   '<tr><td>Supervisor(s): </td><td></td><td>{{ supervisor }}</td></tr>'
-                   '<tr><td>Defense date: </td><td>&nbsp;</td><td>{{ defense_date }}</td></tr>'
-                   '</table>')
+        header += (
+            '</tr>'
+            '<tr><td>Type: </td><td></td><td>' + thesis_type_dict[self.type] +
+            '</td></tr>'
+            '<tr><td>Discipline: </td><td></td><td>' +
+            disciplines_dict[self.discipline] + '</td></tr>'
+            '<tr><td>Domain: </td><td></td><td>' +
+            journals_domains_dict[self.domain] + '</td></tr>'
+            '<tr><td>Subject area: </td><td></td><td>' +
+            subject_areas_dict[self.subject_area] + '</td></tr>'
+            '<tr><td>URL: </td><td>&nbsp;</td><td><a href="{{ pub_link }}" '
+            'target="_blank">{{ pub_link }}</a></td></tr>'
+            '<tr><td>Degree granting institution: </td><td>&nbsp;</td>'
+            '<td>{{ institution }}</td></tr>'
+            '<tr><td>Supervisor(s): </td><td></td><td>{{ supervisor }}'
+            '</td></tr>' '<tr><td>Defense date: </td><td>&nbsp;</td>'
+            '<td>{{ defense_date }}</td></tr>'
+            '</table>')
         template = Template(header)
         return template.render(context)
 
-
-    def header_as_li (self):
-        context = Context({'id': self.id, 'title': self.title, 'author': self.author,
-                           'pub_link': self.pub_link, 'institution': self.institution,
-                           'supervisor': self.supervisor, 'defense_date': self.defense_date,
-                           'latest_activity': self.latest_activity.strftime('%Y-%m-%d %H:%M')})
-        header = ('<li><div class="flex-container">'
-                  '<div class="flex-whitebox0"><p><a href="/thesis/{{ id }}" '
-                  'class="pubtitleli">{{ title }}</a></p>'
-                  '<p>' + thesis_type_dict[self.type] + ' thesis by {{ author }} '
-                  '(supervisor(s): {{ supervisor }}) in '
-                  + disciplines_dict[self.discipline] + ', '
-                  + journals_domains_dict[self.domain] + ' '
-#                  + journals_spec_dict[self.specialization] + ' '
-                  + subject_areas_dict[self.subject_area]
-                  + '</p>'
-                  '<p>Defense date: {{ defense_date }} - '
-                  'Latest activity: {{ latest_activity }}</p></div>'
-                  '</div></li>')
+    def header_as_li(self):
+        context = Context({
+            'id': self.id, 'title': self.title, 'author': self.author,
+            'pub_link': self.pub_link, 'institution': self.institution,
+            'supervisor': self.supervisor, 'defense_date': self.defense_date,
+            'latest_activity': self.latest_activity.strftime('%Y-%m-%d %H:%M')})
+        header = (
+            '<li><div class="flex-container">'
+            '<div class="flex-whitebox0"><p><a href="/thesis/{{ id }}" '
+            'class="pubtitleli">{{ title }}</a></p>'
+            '<p>' + thesis_type_dict[self.type] + ' thesis by {{ author }} '
+            '(supervisor(s): {{ supervisor }}) in ' +
+            disciplines_dict[self.discipline] + ', ' +
+            journals_domains_dict[self.domain] + ' ' +
+            subject_areas_dict[self.subject_area] + '</p>'
+            '<p>Defense date: {{ defense_date }} - '
+            'Latest activity: {{ latest_activity }}</p></div>'
+            '</div></li>')
         template = Template(header)
         return template.render(context)
 
-
-    def simple_header_as_li (self):
+    def simple_header_as_li(self):
         # for Lists
-        context = Context({'id': self.id, 'title': self.title, 'author': self.author})
-        header = ('<li><div class="flex-container">'
-                  '<div class="flex-whitebox0"><p><a href="/thesis/{{ id }}" '
-                  'class="pubtitleli">{{ title }}</a></p>'
-                  '<p>' + thesis_type_dict[self.type]
-                  + ' thesis by {{ author }} </div></div></li>')
+        context = Context({
+            'id': self.id, 'title': self.title, 'author': self.author})
+        header = (
+            '<li><div class="flex-container">'
+            '<div class="flex-whitebox0"><p><a href="/thesis/{{ id }}" '
+            'class="pubtitleli">{{ title }}</a></p>'
+            '<p>' + thesis_type_dict[self.type] +
+            ' thesis by {{ author }} </div></div></li>')
         template = Template(header)
         return template.render(context)