diff --git a/.pylintrc b/.pylintrc
index 57b6b0d..4cc6ce1 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -12,6 +12,7 @@ enable=anomalous-backslash-in-string,
         empty-docstring,
         inconsistent-return-statements,
         invalid-name,
+        no-else-return,
         redefined-argument-from-local,
         too-few-public-methods,
         trailing-whitespace,
diff --git a/src/wuttjamaican/db/util.py b/src/wuttjamaican/db/util.py
index aa99c93..bf1f117 100644
--- a/src/wuttjamaican/db/util.py
+++ b/src/wuttjamaican/db/util.py
@@ -88,30 +88,29 @@ class UUID(sa.types.TypeDecorator):
         """ """
         if dialect.name == "postgresql":
             return dialect.type_descriptor(PGUUID())
-        else:
-            return dialect.type_descriptor(sa.CHAR(32))
+        return dialect.type_descriptor(sa.CHAR(32))
 
     def process_bind_param(self, value, dialect): # pylint: disable=empty-docstring
         """ """
         if value is None:
             return value
-        elif dialect.name == "postgresql":
+
+        if dialect.name == "postgresql":
             return str(value)
-        else:
-            if not isinstance(value, _uuid.UUID):
-                return "%.32x" % _uuid.UUID(value).int
-            else:
-                # hexstring
-                return "%.32x" % value.int
+
+        if not isinstance(value, _uuid.UUID):
+            return "%.32x" % _uuid.UUID(value).int
+
+        # hexstring
+        return "%.32x" % value.int
 
     def process_result_value(self, value, dialect): # pylint: disable=unused-argument,empty-docstring
         """ """
         if value is None:
             return value
-        else:
-            if not isinstance(value, _uuid.UUID):
-                value = _uuid.UUID(value)
-            return value
+        if not isinstance(value, _uuid.UUID):
+            value = _uuid.UUID(value)
+        return value
 
 
 def uuid_column(*args, **kwargs):
diff --git a/src/wuttjamaican/install.py b/src/wuttjamaican/install.py
index 231ea3b..9a59413 100644
--- a/src/wuttjamaican/install.py
+++ b/src/wuttjamaican/install.py
@@ -558,9 +558,9 @@ class InstallHandler(GenericHandler):
         if is_bool:
             if text == '':
                 return default
-            elif text.upper() == 'Y':
+            if text.upper() == 'Y':
                 return True
-            elif text.upper() == 'N':
+            if text.upper() == 'N':
                 return False
             self.rprint("\n\t[bold yellow]ambiguous, please try again[/bold yellow]\n")
             return self.prompt_generic(info, default, is_bool=True)
diff --git a/src/wuttjamaican/people.py b/src/wuttjamaican/people.py
index 3f51240..9513b1b 100644
--- a/src/wuttjamaican/people.py
+++ b/src/wuttjamaican/people.py
@@ -84,7 +84,7 @@ class PeopleHandler(GenericHandler):
             person = obj
             return person
 
-        elif isinstance(obj, model.User):
+        if isinstance(obj, model.User):
             user = obj
             if user.person:
                 return user.person