diff --git a/src/common/classes/AuracleApi.ts b/src/common/classes/AuracleApi.ts
index ae9221a..040540f 100644
--- a/src/common/classes/AuracleApi.ts
+++ b/src/common/classes/AuracleApi.ts
@@ -11,14 +11,14 @@ export class AuracleApi {
     private database?: Sequelize;
 
     constructor(init: {
-        port: number
+        port: any
         middlewares: any
         // controllers: Array<ControllerBase>
         modules?: Array<any>
         database?: Sequelize
     }) {
         this.app = express()
-        this.port = init.port
+        this.port = Number(init.port)
         this.database = init.database
 
         if (init.modules) {
diff --git a/src/main.ts b/src/main.ts
index 05038ac..de6582d 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,20 +1,23 @@
+/**
+ * Dependencies
+ */
+
+// .env Data
 import * as dotenv from 'dotenv';
 dotenv.config();
 
-// Dependencies
+// Packages
 import morgan from 'morgan';
 import helmet from 'helmet';
 import express from 'express'
 
 import { AuracleApi } from './common/classes/AuracleApi'
+import { AuracleDatabaseDriver } from './common/database'
 
-// Database
-import { AuracleDatabaseDriver } from './common/database';
-
-const port = Number(process.env.API_PORT);
+const apiPort = process.env.API_PORT
 
 const app = new AuracleApi({
-    port: port,
+    port: apiPort,
     middlewares: [],
     modules: [
         express.json({ limit: '10kb' }),
@@ -22,23 +25,12 @@ const app = new AuracleApi({
         helmet()
     ],
     database: AuracleDatabaseDriver
-});
+})
 
+// Listens on apiPort...
 app.listen()
-  
-// const routes = require('./routes');
 
-// Builds app w/ express
-// let app = express();
-// app.use(bodyParser.json({ limit: '10kb' }));
-// app.use(cors({
-//     origin: [
-//         "http://localhost:8080",
-//     ],
-//     credentials: true,
-// }));
-// app.use(morgan('dev'));
-// app.use(helmet());
+// const routes = require('./routes');
 
 // // Server
 // app.listen(port, () => console.log(`App listening on port ${port}`));
@@ -52,4 +44,4 @@ app.listen()
 // app.use('/api/v1/meta_schools', routes.meta_schools);
 // app.use('/api/v1/variables', routes.variables);
 // app.use('/api/v1/ingredients', routes.ingredients);
-// app.use('/api/v1/users', routes.users);
\ No newline at end of file
+// app.use('/api/v1/users', routes.users);