diff --git a/ogn/commands/database.py b/ogn/commands/database.py
index 0185f30..2935b9c 100644
--- a/ogn/commands/database.py
+++ b/ogn/commands/database.py
@@ -1,15 +1,14 @@
 from ogn.model import Base
+from ogn.collect.fetchddb import update_ddb_from_ogn, update_ddb_from_file
+from ogn.commands.dbutils import engine
 
 from manager import Manager
 manager = Manager()
 
-from ogn.collect.fetchddb import update_ddb_from_ogn, update_ddb_from_file
-
 
 @manager.command
 def init():
     """Initialize the database."""
-    from ogn.commands.dbutils import engine
     Base.metadata.create_all(engine)
     print("Done.")
 
diff --git a/ogn/gateway/manage.py b/ogn/gateway/manage.py
index ce50a83..b813775 100644
--- a/ogn/gateway/manage.py
+++ b/ogn/gateway/manage.py
@@ -3,15 +3,16 @@ import socket
 from ogn.gateway import ognGateway
 from ogn.logger import logger
 
-DB_URI = 'sqlite:///beacons.db'
-
 from manager import Manager
 manager = Manager()
 
+DB_URI = 'sqlite:///beacons.db'
+
 
 @manager.command
 def run(aprs_user="anon-dev"):
     """Run the aprs client."""
+
     if len(aprs_user) < 3 or len(aprs_user) > 9:
         print("aprs_user must be a string of 3-9 characters")
         return