Reduced if/else complexity, removed not require else conditions (#1866)

* Reduced if/else complexity, removed not require else conditions

* Fix indentation

* Fix indentation

* Use null-coalesce to simplify logic

* Use null-coalesce to simplify logic

* Use null-coalesce to simplify logic

* Use null-coalesce to simplify logic

* Use null-coalesce to simplify logic

* Use null-coalesce to simplify logic

* Admin theme no longer exists

* Code style

* Use null-coalesce operator to simplify logic

1 files changed, 12 insertions, 12 deletions

diff --git a/app/Census/AbstractCensusColumn.php b/app/Census/AbstractCensusColumn.php
index 61af235270..062a1e135d 100644
--- a/app/Census/AbstractCensusColumn.php
+++ b/app/Census/AbstractCensusColumn.php
@@ -71,9 +71,9 @@ class AbstractCensusColumn
 
         if ($family) {
             return $family->getHusband();
-        } else {
-            return null;
         }
+
+        return null;
     }
 
     /**
@@ -89,9 +89,9 @@ class AbstractCensusColumn
 
         if ($family) {
             return $family->getWife();
-        } else {
-            return null;
         }
+
+        return null;
     }
 
     /**
@@ -113,13 +113,13 @@ class AbstractCensusColumn
 
         if (empty($families)) {
             return null;
-        } else {
-            usort($families, function (Family $x, Family $y): int {
-                return Date::compare($x->getMarriageDate(), $y->getMarriageDate());
-            });
-
-            return end($families);
         }
+
+        usort($families, function (Family $x, Family $y): int {
+            return Date::compare($x->getMarriageDate(), $y->getMarriageDate());
+        });
+
+        return end($families);
     }
 
     /**
@@ -169,9 +169,9 @@ class AbstractCensusColumn
 
         if (end($parts) === $this->place()) {
             return implode(', ', array_slice($parts, 0, -1));
-        } else {
-            return $place;
         }
+
+        return $place;
     }
 
     /**