diff --git a/sherlock/sherlock.py b/sherlock/sherlock.py
index 0eac7825..97beb77d 100644
--- a/sherlock/sherlock.py
+++ b/sherlock/sherlock.py
@@ -64,7 +64,7 @@ class SherlockFuturesSession(FuturesSession):
             kwargs                 -- Keyword arguments.
 
             Return Value:
-            N/A
+            Nothing.
             """
             resp.elapsed = monotonic() - start
 
@@ -532,7 +532,7 @@ def main():
                   f"You are running version {local_version}. Version {remote_version} is available at https://git.io/sherlock")
 
     except Exception as error:
-        print(f"A problem occured while checking for an update: {error}")
+        print(f"A problem occurred while checking for an update: {error}")
 
 
     # Argument check
diff --git a/sherlock/tests/all.py b/sherlock/tests/all.py
index b7b7f912..3299c497 100644
--- a/sherlock/tests/all.py
+++ b/sherlock/tests/all.py
@@ -17,7 +17,7 @@ class SherlockDetectTests(SherlockBaseTest):
         self                   -- This object.
 
         Return Value:
-        N/A.
+        Nothing.
         Will trigger an assert if detection mechanism did not work as expected.
         """
 
@@ -44,7 +44,7 @@ class SherlockDetectTests(SherlockBaseTest):
         self                   -- This object.
 
         Return Value:
-        N/A.
+        Nothing.
         Will trigger an assert if detection mechanism did not work as expected.
         """
 
@@ -71,7 +71,7 @@ class SherlockDetectTests(SherlockBaseTest):
         self                   -- This object.
 
         Return Value:
-        N/A.
+        Nothing.
         Will trigger an assert if detection mechanism did not work as expected.
         """
 
@@ -98,7 +98,7 @@ class SherlockDetectTests(SherlockBaseTest):
         self                   -- This object.
 
         Return Value:
-        N/A.
+        Nothing.
         Will trigger an assert if detection mechanism did not work as expected.
         """
 
@@ -125,7 +125,7 @@ class SherlockDetectTests(SherlockBaseTest):
         self                   -- This object.
 
         Return Value:
-        N/A.
+        Nothing.
         Will trigger an assert if detection mechanism did not work as expected.
         """
 
@@ -152,7 +152,7 @@ class SherlockDetectTests(SherlockBaseTest):
         self                   -- This object.
 
         Return Value:
-        N/A.
+        Nothing.
         Will trigger an assert if detection mechanism did not work as expected.
         """
 
@@ -181,7 +181,7 @@ class SherlockSiteCoverageTests(SherlockBaseTest):
         self                   -- This object.
 
         Return Value:
-        N/A.
+        Nothing.
         Will trigger an assert if detection mechanism did not work as expected.
         """
 
@@ -199,7 +199,7 @@ class SherlockSiteCoverageTests(SherlockBaseTest):
         self                   -- This object.
 
         Return Value:
-        N/A.
+        Nothing.
         Will trigger an assert if detection mechanism did not work as expected.
         """
 
@@ -217,7 +217,7 @@ class SherlockSiteCoverageTests(SherlockBaseTest):
         self                   -- This object.
 
         Return Value:
-        N/A.
+        Nothing.
         Will trigger an assert if detection mechanism did not work as expected.
         """
 
@@ -235,7 +235,7 @@ class SherlockSiteCoverageTests(SherlockBaseTest):
         self                   -- This object.
 
         Return Value:
-        N/A.
+        Nothing.
         Will trigger an assert if detection mechanism did not work as expected.
         """
 
@@ -253,7 +253,7 @@ class SherlockSiteCoverageTests(SherlockBaseTest):
         self                   -- This object.
 
         Return Value:
-        N/A.
+        Nothing.
         Will trigger an assert if detection mechanism did not work as expected.
         """
 
@@ -271,7 +271,7 @@ class SherlockSiteCoverageTests(SherlockBaseTest):
         self                   -- This object.
 
         Return Value:
-        N/A.
+        Nothing.
         Will trigger an assert if detection mechanism did not work as expected.
         """
 
@@ -288,7 +288,7 @@ class SherlockSiteCoverageTests(SherlockBaseTest):
         self                   -- This object.
 
         Return Value:
-        N/A.
+        Nothing.
         Will trigger an assert if we do not have total coverage.
         """
 
diff --git a/sherlock/tests/base.py b/sherlock/tests/base.py
index 190aaaae..20605d20 100644
--- a/sherlock/tests/base.py
+++ b/sherlock/tests/base.py
@@ -23,7 +23,7 @@ class SherlockBaseTest(unittest.TestCase):
         self                   -- This object.
 
         Return Value:
-        N/A.
+        Nothing.
         """
 
         #This ignores the ResourceWarning from an unclosed SSLSocket.
@@ -97,7 +97,7 @@ class SherlockBaseTest(unittest.TestCase):
                                   or non-existence.
 
         Return Value:
-        N/A.
+        Nothing.
         Will trigger an assert if Username does not have the expected
         existence state.
         """
@@ -154,7 +154,7 @@ class SherlockBaseTest(unittest.TestCase):
                                   or non-existence.
 
         Return Value:
-        N/A.
+        Nothing.
         Runs tests on all sites using the indicated detection algorithm
         and which also has test vectors specified.
         Will trigger an assert if Username does not have the expected
@@ -208,7 +208,7 @@ class SherlockBaseTest(unittest.TestCase):
         self                   -- This object.
 
         Return Value:
-        N/A.
+        Nothing.
         Counts up all Sites with full test data available.
         Will trigger an assert if any Site does not have test coverage.
         """