diff --git a/src/getSSLSettings.js b/src/getSSLSettings.js
index de310bf..670514f 100644
--- a/src/getSSLSettings.js
+++ b/src/getSSLSettings.js
@@ -1,6 +1,18 @@
 const optimist = require('optimist');
 const path = require('path');
 
+const getDefaultSSLArgs = () => {
+  return ({
+    runhttps: false,
+    sshport: 22,
+    sshhost: 'localhost',
+    sshauth: 'password',
+    globalsshuser: '',
+    port: undefined,
+    ssl: undefined,
+  });
+};
+
 const getOptions = () => {
   return (
     optimist
@@ -38,29 +50,6 @@ const getOptions = () => {
   );
 };
 
-const getSSLObject = opts => {
-  if (opts.sslkey && opts.sslcert){
-    return ({
-      key:  opts.sslkey,
-      cert: opts.sslcert,
-    });
-  }
-  return undefined;
-};
-
-
-const getDefaultSSLArgs = () => {
-  return ({
-    runhttps: false,
-    sshport: 22,
-    sshhost: 'localhost',
-    sshauth: 'password',
-    globalsshuser: '',
-    port: undefined,
-    ssl: undefined,
-  });
-};
-
 const getSSLArgsFromCommandLine = () => {
   const defaultArgs = getDefaultSSLArgs();
   const opts = getOptions();
@@ -72,12 +61,11 @@ const getSSLArgsFromCommandLine = () => {
     sshauth: opts.sshauth ? opts.sshauth : defaultArgs.sshauth,
     globalsshuser: opts.sshuser? opts.sshuser: defaultArgs.globalsshuser,
     port:  opts.port ? opts.port: defaultArgs.port,
-    ssl: getSSLObject(opts),
+    ssl: (opts.sslkey && opts.sslcert) ? { key: opts.sslkey, cert: opts.sslcert} : undefined,
   };
   return args;
 };
 
-
 module.exports = {
   getSSLArgsFromCommandLine,
   getDefaultSSLArgs,
diff --git a/src/index.js b/src/index.js
index db85d96..adf438e 100644
--- a/src/index.js
+++ b/src/index.js
@@ -3,7 +3,6 @@ const startServer = require('./startServer');
 const getSSLArgsFromCommandLine = require('./getSSLSettings.js').getSSLArgsFromCommandLine;
 const getDefaultSSLArgs = require('./getSSLSettings').getDefaultSSLArgs;
 
-
 const runApp = () => {
   process.on('uncaughtException', function(e) {
     console.error('Wetty Error: ' + e);