diff --git a/conjur/api/api.py b/conjur/api/api.py
index 1fd5c4e7..fb7e25ea 100644
--- a/conjur/api/api.py
+++ b/conjur/api/api.py
@@ -11,7 +11,7 @@
 from typing import Optional
 from datetime import datetime, timedelta
 
-# Third party
+# Third Parties
 import requests
 
 # Internals
diff --git a/conjur/cli.py b/conjur/cli.py
index ddff9a9b..c5bdc765 100644
--- a/conjur/cli.py
+++ b/conjur/cli.py
@@ -315,9 +315,6 @@ def run_action(resource:str, args):
             result = client.whoami()
             print(json.dumps(result, indent=4))
 
-        elif resource == 'hostfactory':
-            Cli.handle_hostfactory_logic(args, client)
-
         elif resource == 'variable':
             Cli.handle_variable_logic(args, client)
 
@@ -331,6 +328,9 @@ def run_action(resource:str, args):
         elif resource == 'host':
             Cli.handle_host_logic(args, client)
 
+        elif resource == 'hostfactory':
+            Cli.handle_hostfactory_logic(args, client)
+
     @staticmethod
     def _parse_args(parser: ArgparseWrapper):
         args = parser.parse_args()
diff --git a/conjur/logic/hostfactory_logic.py b/conjur/logic/hostfactory_logic.py
index fe986aa8..0b1b8cbe 100644
--- a/conjur/logic/hostfactory_logic.py
+++ b/conjur/logic/hostfactory_logic.py
@@ -5,6 +5,8 @@
 This module holds the business logic for executing and manipulating
 returned data
 """
+
+# Builtins
 import json
 from urllib import parse