Tidy up

wcivf/apps/people/models.py

@@ -165,9 +165,7 @@ def facebook_personal_username(self):
     def facebook_username(self):
         facebook_page_url = self.facebook_page_url
         facebook_split = list(filter(None, facebook_page_url.split("/")))
-        facebook_username = facebook_split[-1]
-
-        return facebook_username
+        return facebook_split[-1]
 
     @property
     def instagram_username(self):
@@ -218,10 +216,7 @@ def statement_remainder(self):
 
     @property
     def display_deceased(self):
-        if self.death_date and self.current_or_future_candidacies:
-            return True
-        else:
-            return False
+        return self.death_date and self.current_or_future_candidacies
 
     @cached_property
     def current_or_future_candidacies(self):

wcivf/apps/people/templates/people/includes/_person_about_card.html

@@ -4,8 +4,8 @@
     <h2 class="ds-candidate-name ds-h3">
       About {{ object.name }}
     </h2>
+    {% if object.cv %}
     <p>
-      {% if object.cv %}
     <h3>CV</h3>
     <p>{{ object.cv }}</p>
     {% endif %}
@@ -28,7 +28,7 @@ <h3>Associated companies</h3>
         {{ company.role }}{% if company.role_status %}({{ company.role_status }}){% endif %}
         {{ company.role_appointed_date | date:"Y" }} &ndash; {{ company.role_resigned_date | date:"Y"}}
 
-        <a href="https://beta.companieshouse.gov.uk/company/{{ company.company_number }}/">#}
+        <a href="https://beta.companieshouse.gov.uk/company/{{ company.company_number }}/">
           More details from Companies House}
         </a>
       </li>

wcivf/apps/people/templates/people/person_detail.html

@@ -39,8 +39,6 @@
       {% include "elections/includes/_postcode_search_form.html" %}
       {% endif %}
 
-      {#{% include "feedback/feedback_form.html" %}#}
-
     </div>
   </div>
 </div>