diff --git a/devices/mpc106.cpp b/devices/mpc106.cpp
index fd0cf8a..c6c1f12 100644
--- a/devices/mpc106.cpp
+++ b/devices/mpc106.cpp
@@ -144,7 +144,7 @@ void MPC106::pci_cfg_write(uint32_t reg_offs, uint32_t value, uint32_t size)
     // FIXME: implement write-protection for read-only registers
     switch(size) {
     case 1:
-        this->my_pci_cfg_hdr[reg_offs] = value & 0xFF;
+        this->my_pci_cfg_hdr[reg_offs]   = value & 0xFF;
         break;
     case 2:
         this->my_pci_cfg_hdr[reg_offs]   = (value >> 8) & 0xFF;
diff --git a/devices/viacuda.cpp b/devices/viacuda.cpp
index 7e9c595..98dd76a 100644
--- a/devices/viacuda.cpp
+++ b/devices/viacuda.cpp
@@ -23,12 +23,12 @@ ViaCuda::ViaCuda()
 {
     /* FIXME: is this the correct
        VIA initialization? */
-    this->via_regs[VIA_A] = 0x80;
+    this->via_regs[VIA_A]    = 0x80;
     this->via_regs[VIA_DIRB] = 0xFF;
     this->via_regs[VIA_DIRA] = 0xFF;
     this->via_regs[VIA_T1LL] = 0xFF;
     this->via_regs[VIA_T1LH] = 0xFF;
-    this->via_regs[VIA_IER] = 0x7F;
+    this->via_regs[VIA_IER]  = 0x7F;
 
     //PRAM Pre-Initialization
     this->pram_obj = new NVram("pram.bin", 256);
@@ -44,11 +44,11 @@ ViaCuda::~ViaCuda()
 
 void ViaCuda::cuda_init()
 {
-    this->old_tip = 0;
+    this->old_tip     = 0;
     this->old_byteack = 0;
-    this->treq = 1;
-    this->in_count = 0;
-    this->out_count = 0;
+    this->treq        = 1;
+    this->in_count    = 0;
+    this->out_count   = 0;
 
 }
 
@@ -171,8 +171,8 @@ void ViaCuda::cuda_write(uint8_t new_state)
         else {
             LOG_F(9, "Cuda: enter sync state \n");
             this->via_regs[VIA_B] &= ~CUDA_TREQ; /* assert TREQ */
-            this->treq = 0;
-            this->in_count = 0;
+            this->treq      = 0;
+            this->in_count  = 0;
             this->out_count = 0;
         }
 
@@ -210,8 +210,8 @@ void ViaCuda::cuda_response_header(uint32_t pkt_type, uint32_t pkt_flag)
     this->out_buf[0] = pkt_type;
     this->out_buf[1] = pkt_flag;
     this->out_buf[2] = this->in_buf[1]; /* copy original cmd */
-    this->out_count = 3;
-    this->out_pos = 0;
+    this->out_count  = 3;
+    this->out_pos    = 0;
 }
 
 void ViaCuda::cuda_error_response(uint32_t error)
@@ -220,8 +220,8 @@ void ViaCuda::cuda_error_response(uint32_t error)
     this->out_buf[1] = error;
     this->out_buf[2] = this->in_buf[0];
     this->out_buf[3] = this->in_buf[1]; /* copy original cmd */
-    this->out_count = 4;
-    this->out_pos = 0;
+    this->out_count  = 4;
+    this->out_pos    = 0;
 }
 
 void ViaCuda::cuda_process_packet()
diff --git a/main.cpp b/main.cpp
index 68e120f..fbd3c5a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -73,9 +73,9 @@ int main(int argc, char **argv)
         if ((checker == "1") || (checker == "realtime") || \
             (checker == "-realtime") || (checker == "/realtime")) {
             loguru::g_stderr_verbosity = loguru::Verbosity_OFF;
-            loguru::g_preamble_date = false;
-            loguru::g_preamble_time = false;
-            loguru::g_preamble_thread = false;
+            loguru::g_preamble_date    = false;
+            loguru::g_preamble_time    = false;
+            loguru::g_preamble_thread  = false;
             loguru::init(argc, argv);
             loguru::add_file("dingusppc.log", loguru::Append, 0);
             //Replace the above line with this for maximum debugging detail:
@@ -83,11 +83,11 @@ int main(int argc, char **argv)
         }
         else if ((checker == "debugger") || (checker == "/debugger") ||
             (checker == "-debugger")) {
-            loguru::g_preamble_date = false;
-            loguru::g_preamble_time = false;
-            loguru::g_preamble_thread = false;
-            loguru::init(argc, argv);
             loguru::g_stderr_verbosity = 0;
+            loguru::g_preamble_date    = false;
+            loguru::g_preamble_time    = false;
+            loguru::g_preamble_thread  = false;
+            loguru::init(argc, argv);
         }
 
         uint32_t rom_filesize;
@@ -196,11 +196,11 @@ int main(int argc, char **argv)
         }
     }
     else {
-        std::cout << "                    " << endl;
+        std::cout << "                                                " << endl;
         std::cout << "Please enter one of the following commands when " << endl;
         std::cout << "booting up DingusPPC...                         " << endl;
-        std::cout << "                    " << endl;
-        std::cout << "                    " << endl;
+        std::cout << "                                                " << endl;
+        std::cout << "                                                " << endl;
         std::cout << "realtime - Run the emulator in real-time.       " << endl;
         std::cout << "debugger - Enter the interactive debugger.      " << endl;
     }