diff --git a/src/api/LoginSession.cpp b/src/api/LoginSession.cpp
index 8e202d4c..9b947d19 100644
--- a/src/api/LoginSession.cpp
+++ b/src/api/LoginSession.cpp
@@ -1,15 +1,14 @@
 #include "LoginSession.h"
 
 namespace Sapphire {
-LoginSession::LoginSession( void )
-{
-  //setSocket(NULL);
+  LoginSession::LoginSession( void )
+  {
+    //setSocket(NULL);
+  }
 
-}
-
-LoginSession::~LoginSession( void )
-{
-
-}
+  LoginSession::~LoginSession( void )
+  {
+
+  }
 }
 
diff --git a/src/api/LoginSession.h b/src/api/LoginSession.h
index 66fc1f4f..1811bf09 100644
--- a/src/api/LoginSession.h
+++ b/src/api/LoginSession.h
@@ -14,8 +14,8 @@ namespace Sapphire
   {
 
   private:
-    uint32_t m_IP;
-    uint32_t m_accountID;
+    uint32_t m_ip;
+    uint32_t m_accountId;
     uint8_t m_sessionId[56];
 
   public:
@@ -25,9 +25,9 @@ namespace Sapphire
 
     ~LoginSession( void );
 
-    uint32_t getIP()
+    uint32_t getIp()
     {
-      return m_IP;
+      return m_ip;
     }
 
     void setSessionId( uint8_t* sessionId )
@@ -35,29 +35,21 @@ namespace Sapphire
       memcpy( m_sessionId, sessionId, 56 );
     }
 
-    void setIP( uint32_t iP )
+    void setIp( uint32_t ip )
     {
-      m_IP = iP;
+      m_ip = ip;
     }
 
-    uint32_t getAccountID()
+    uint32_t getAccountId()
     {
-      return m_accountID;
+      return m_accountId;
     }
 
-    void setAccountID( uint32_t iD )
+    void setAccountId( uint32_t id )
     {
-      m_accountID = iD;
+      m_accountId = id;
     }
 
-    /*INLINE CLobbySocket* getSocket() {
-    return m_pGS;
-    }
-
-    INLINE void setSocket(CLobbySocket * pS) {
-    m_pGS = pS;
-    }*/
-
   };
 
 }
diff --git a/src/common/Config/ConfigDef.h b/src/common/Config/ConfigDef.h
index 4d99591f..de149074 100644
--- a/src/common/Config/ConfigDef.h
+++ b/src/common/Config/ConfigDef.h
@@ -33,7 +33,6 @@ namespace Sapphire::Common::Config
     } network;
   };
 
-
   struct WorldConfig
   {
     GlobalConfig global;
diff --git a/src/common/Crypt/md5.h b/src/common/Crypt/md5.h
index 9d112194..cfdb4ad8 100644
--- a/src/common/Crypt/md5.h
+++ b/src/common/Crypt/md5.h
@@ -29,8 +29,7 @@ namespace Sapphire::Util
     "message digest",
     "abcdefghijklmnopqrstuvwxyz",
     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
-    "12345678901234567890123456789012345678901234567890123456789012" \
-         "345678901234567890"
+    "12345678901234567890123456789012345678901234567890123456789012345678901234567890"
   };
 
   static const char* val[] =
diff --git a/src/common/Database/DbConnection.cpp b/src/common/Database/DbConnection.cpp
index de9efbc5..133baa56 100644
--- a/src/common/Database/DbConnection.cpp
+++ b/src/common/Database/DbConnection.cpp
@@ -18,7 +18,7 @@ Sapphire::Db::DbConnection::DbConnection( ConnectionInfo& connInfo ) :
 }
 
 Sapphire::Db::DbConnection::DbConnection( Sapphire::LockedWaitQueue< std::shared_ptr< Operation > >* queue,
-                                      Sapphire::Db::ConnectionInfo& connInfo ) :
+                                          Sapphire::Db::ConnectionInfo& connInfo ) :
   m_reconnecting( false ),
   m_prepareError( false ),
   m_queue( queue ),
@@ -209,7 +209,9 @@ std::shared_ptr< Mysql::PreparedStatement > Sapphire::Db::DbConnection::getPrepa
   return ret;
 }
 
-void Sapphire::Db::DbConnection::prepareStatement( uint32_t index, const std::string& sql, Sapphire::Db::ConnectionFlags flags )
+void Sapphire::Db::DbConnection::prepareStatement( uint32_t index,
+                                                   const std::string& sql,
+                                                   Sapphire::Db::ConnectionFlags flags )
 {
   m_queries.insert( PreparedStatementMap::value_type( index, std::make_pair( sql, flags ) ) );
 
diff --git a/src/common/Database/DbLoader.cpp b/src/common/Database/DbLoader.cpp
index 1d6b52be..635d82b2 100644
--- a/src/common/Database/DbLoader.cpp
+++ b/src/common/Database/DbLoader.cpp
@@ -104,5 +104,5 @@ bool Sapphire::Db::DbLoader::process( std::queue< Predicate >& queue )
 template
 Sapphire::Db::DbLoader&
 Sapphire::Db::DbLoader::addDb< Sapphire::Db::ZoneDbConnection >( Sapphire::Db::DbWorkerPool< Sapphire::Db::ZoneDbConnection >&,
-                                                          const ConnectionInfo& );
+                                                                 const ConnectionInfo& );
 
diff --git a/src/common/Database/DbWorker.cpp b/src/common/Database/DbWorker.cpp
index cd492410..74ee0378 100644
--- a/src/common/Database/DbWorker.cpp
+++ b/src/common/Database/DbWorker.cpp
@@ -2,7 +2,8 @@
 #include "Operation.h"
 #include "Util/LockedWaitQueue.h"
 
-Sapphire::Db::DbWorker::DbWorker( Sapphire::LockedWaitQueue< std::shared_ptr< Operation > >* newQueue, DbConnection* pConn )
+Sapphire::Db::DbWorker::DbWorker( Sapphire::LockedWaitQueue< std::shared_ptr< Operation > >* newQueue,
+                                  DbConnection* pConn )
 {
   m_pConn = pConn;
   m_queue = newQueue;
diff --git a/src/common/Database/DbWorkerPool.cpp b/src/common/Database/DbWorkerPool.cpp
index ff6d9e34..c9ef3b51 100644
--- a/src/common/Database/DbWorkerPool.cpp
+++ b/src/common/Database/DbWorkerPool.cpp
@@ -10,8 +10,7 @@
 #include "Logging/Logger.h"
 #include <mysql.h>
 
-class PingOperation :
-  public Sapphire::Db::Operation
+class PingOperation : public Sapphire::Db::Operation
 {
   bool execute() override
   {
@@ -256,25 +255,5 @@ void Sapphire::Db::DbWorkerPool< T >::directExecute( std::shared_ptr< PreparedSt
   connection->unlock();
 }
 
-/*
-template <class T>
-void DatabaseWorkerPool<T>::ExecuteOrAppend(SQLTransaction& trans, const char* sql)
-{
-   if (!trans)
-      Execute(sql);
-   else
-      trans->Append(sql);
-}
-
-template <class T>
-void DatabaseWorkerPool<T>::ExecuteOrAppend(SQLTransaction& trans, PreparedStatement* stmt)
-{
-   if (!trans)
-      Execute(stmt);
-   else
-      trans->Append(stmt);
-}
-*/
-
 template
 class Sapphire::Db::DbWorkerPool< Sapphire::Db::ZoneDbConnection >;
diff --git a/src/common/Database/DbWorkerPool.h b/src/common/Database/DbWorkerPool.h
index 6ce6b76d..a29bd3f1 100644
--- a/src/common/Database/DbWorkerPool.h
+++ b/src/common/Database/DbWorkerPool.h
@@ -44,7 +44,7 @@ namespace Sapphire::Db
 
     bool prepareStatements();
 
-    inline ConnectionInfo getConnectionInfo() const
+    const ConnectionInfo& getConnectionInfo() const
     {
       return m_connectionInfo;
     }
diff --git a/src/common/Database/StatementTask.cpp b/src/common/Database/StatementTask.cpp
index d216bce3..5a449b6e 100644
--- a/src/common/Database/StatementTask.cpp
+++ b/src/common/Database/StatementTask.cpp
@@ -39,9 +39,8 @@ bool Sapphire::Db::StatementTask::execute()
 
 
 Sapphire::Db::PreparedStatementTask::PreparedStatementTask( std::shared_ptr< Sapphire::Db::PreparedStatement > stmt,
-                                                        bool async ) :
+                                                            bool async ) :
   m_stmt( stmt )
-//, m_result(nullptr)
 {
   m_hasResult = async; // If the operation is async, then there's a result
 }
diff --git a/src/common/Database/StatementTask.h b/src/common/Database/StatementTask.h
index 1a1e5211..79d56673 100644
--- a/src/common/Database/StatementTask.h
+++ b/src/common/Database/StatementTask.h
@@ -9,8 +9,7 @@ namespace Sapphire::Db
 {
   class PreparedStatement;
 
-  class StatementTask :
-    public Operation
+  class StatementTask : public Operation
   {
   public:
 
@@ -20,15 +19,9 @@ namespace Sapphire::Db
 
     bool execute() override;
 
-    //   QueryResultFuture getFuture() const
-    //   {
-    //      return m_result->get_future();
-    //   }
-
   private:
     std::string m_sql;
     bool m_hasResult;
-  //      QueryResultPromise *m_result;
   };
 
   class PreparedStatementTask :
@@ -40,12 +33,10 @@ namespace Sapphire::Db
     ~PreparedStatementTask();
 
     bool execute() override;
-    //PreparedQueryResultFuture getFuture() { return m_result->get_future(); }
 
   protected:
     std::shared_ptr< PreparedStatement > m_stmt;
     bool m_hasResult;
-    //PreparedQueryResultPromise* m_result;
   };
 
 }
diff --git a/src/common/Forwards.h b/src/common/Forwards.h
index 1746b883..7434f861 100644
--- a/src/common/Forwards.h
+++ b/src/common/Forwards.h
@@ -5,33 +5,28 @@
 
 namespace Sapphire
 {
-
   class ConfigMgr;
-  using ConfigMgrPtr = std::shared_ptr< ConfigMgr >;
   class Framework;
+  using ConfigMgrPtr = std::shared_ptr< ConfigMgr >;
   using FrameworkPtr = std::shared_ptr< Framework >;
-
-  namespace Network
-  {
-    class Hive;
-    class Acceptor;
-    class Connection;
-    using HivePtr = std::shared_ptr< Hive >;
-    using AcceptorPtr = std::shared_ptr< Acceptor >;
-    using ConnectionPtr = std::shared_ptr< Connection >;
-
-    namespace Packets
-    {
-      class GamePacket;
-      class FFXIVPacketBase;
-      using GamePacketPtr = std::shared_ptr< GamePacket >;
-      using FFXIVPacketBasePtr = std::shared_ptr< FFXIVPacketBase >;
-    }
-
-  }
-
-
 }
 
+namespace Sapphire::Network
+{
+  class Hive;
+  class Acceptor;
+  class Connection;
+  using HivePtr = std::shared_ptr< Hive >;
+  using AcceptorPtr = std::shared_ptr< Acceptor >;
+  using ConnectionPtr = std::shared_ptr< Connection >;
+}
+
+namespace Sapphire::Network::Packets
+{
+  class GamePacket;
+  class FFXIVPacketBase;
+  using GamePacketPtr = std::shared_ptr< GamePacket >;
+  using FFXIVPacketBasePtr = std::shared_ptr< FFXIVPacketBase >;
+}
 
 #endif
diff --git a/src/common/Logging/Logger.cpp b/src/common/Logging/Logger.cpp
index a8c17bff..13561543 100644
--- a/src/common/Logging/Logger.cpp
+++ b/src/common/Logging/Logger.cpp
@@ -10,82 +10,78 @@
 
 namespace fs = std::experimental::filesystem;
 
-namespace Sapphire
+Sapphire::Logger::Logger()
 {
 
-  Logger::Logger()
-  {
+}
 
-  }
-
-  Logger::~Logger()
-  {
-
-  }
-
-  void Logger::init( const std::string& logPath )
-  {
-    auto pos = logPath.find_last_of( fs::path::preferred_separator );
-
-    if( pos != std::string::npos )
-    {
-      std::string realPath = logPath.substr( 0, pos );
-      fs::create_directories( realPath );
-    }
-
-    spdlog::init_thread_pool( 8192, 1 );
-
-    auto stdout_sink = std::make_shared< spdlog::sinks::stdout_color_sink_mt >();
-    auto daily_sink = std::make_shared< spdlog::sinks::daily_file_sink_mt >( logPath + ".log", 0, 0 );
-
-    std::vector< spdlog::sink_ptr > sinks { stdout_sink, daily_sink };
-
-    auto logger = std::make_shared< spdlog::async_logger >( "logger", sinks.begin(), sinks.end(),
-                                                            spdlog::thread_pool(), spdlog::async_overflow_policy::block );
-
-
-    spdlog::register_logger( logger );
-    spdlog::set_pattern( "[%H:%M:%S.%e] [%^%l%$] %v" );
-    spdlog::set_level( spdlog::level::debug );
-    // always flush the log on criticial messages, otherwise it's done by libc
-    // see: https://github.com/gabime/spdlog/wiki/7.-Flush-policy
-    // nb: if the server crashes, log data can be missing from the file unless something logs critical just before it does
-    spdlog::flush_on( spdlog::level::critical );
-  }
-
-  void Logger::setLogLevel( uint8_t logLevel )
-  {
-    spdlog::set_level( static_cast< spdlog::level::level_enum >( logLevel ) );
-  }
-
-  void Logger::error( const std::string& text )
-  {
-    spdlog::get( "logger" )->error( text );
-  }
-
-  void Logger::warn( const std::string& text )
-  {
-    spdlog::get( "logger" )->warn( text );
-  }
-
-  void Logger::info( const std::string& text )
-  {
-    spdlog::get( "logger" )->info( text );
-  }
-
-  void Logger::debug( const std::string& text )
-  {
-    spdlog::get( "logger" )->debug( text );
-  }
-
-  void Logger::fatal( const std::string& text )
-  {
-    spdlog::get( "logger" )->critical( text );
-  }
-
-  void Logger::trace( const std::string& text )
-  {
-    spdlog::get( "logger" )->trace( text );
-  }
+Sapphire::Logger::~Logger()
+{
 
 }
+
+void Sapphire::Logger::init( const std::string& logPath )
+{
+  auto pos = logPath.find_last_of( fs::path::preferred_separator );
+
+  if( pos != std::string::npos )
+  {
+    std::string realPath = logPath.substr( 0, pos );
+    fs::create_directories( realPath );
+  }
+
+  spdlog::init_thread_pool( 8192, 1 );
+
+  auto stdout_sink = std::make_shared< spdlog::sinks::stdout_color_sink_mt >();
+  auto daily_sink = std::make_shared< spdlog::sinks::daily_file_sink_mt >( logPath + ".log", 0, 0 );
+
+  std::vector< spdlog::sink_ptr > sinks { stdout_sink, daily_sink };
+
+  auto logger = std::make_shared< spdlog::async_logger >( "logger", sinks.begin(), sinks.end(),
+                                                          spdlog::thread_pool(), spdlog::async_overflow_policy::block );
+
+
+  spdlog::register_logger( logger );
+  spdlog::set_pattern( "[%H:%M:%S.%e] [%^%l%$] %v" );
+  spdlog::set_level( spdlog::level::debug );
+  // always flush the log on criticial messages, otherwise it's done by libc
+  // see: https://github.com/gabime/spdlog/wiki/7.-Flush-policy
+  // nb: if the server crashes, log data can be missing from the file unless something logs critical just before it does
+  spdlog::flush_on( spdlog::level::critical );
+}
+
+void Sapphire::Logger::setLogLevel( uint8_t logLevel )
+{
+  spdlog::set_level( static_cast< spdlog::level::level_enum >( logLevel ) );
+}
+
+void Sapphire::Logger::error( const std::string& text )
+{
+  spdlog::get( "logger" )->error( text );
+}
+
+void Sapphire::Logger::warn( const std::string& text )
+{
+  spdlog::get( "logger" )->warn( text );
+}
+
+void Sapphire::Logger::info( const std::string& text )
+{
+  spdlog::get( "logger" )->info( text );
+}
+
+void Sapphire::Logger::debug( const std::string& text )
+{
+  spdlog::get( "logger" )->debug( text );
+}
+
+void Sapphire::Logger::fatal( const std::string& text )
+{
+  spdlog::get( "logger" )->critical( text );
+}
+
+void Sapphire::Logger::trace( const std::string& text )
+{
+  spdlog::get( "logger" )->trace( text );
+}
+
diff --git a/src/common/Network/Acceptor.cpp b/src/common/Network/Acceptor.cpp
index 129cc716..ab76398c 100644
--- a/src/common/Network/Acceptor.cpp
+++ b/src/common/Network/Acceptor.cpp
@@ -2,12 +2,7 @@
 #include "Acceptor.h"
 #include "Connection.h"
 
-namespace Sapphire::Network 
-{
-
-//-----------------------------------------------------------------------------
-
-Acceptor::Acceptor( HivePtr hive ) :
+Sapphire::Network::Acceptor::Acceptor( HivePtr hive ) :
   m_hive( hive ),
   m_acceptor( hive->getService() ),
   m_io_strand( hive->getService() ),
@@ -15,22 +10,21 @@ Acceptor::Acceptor( HivePtr hive ) :
 {
 }
 
-Acceptor::~Acceptor()
+Sapphire::Network::Acceptor::~Acceptor()
 {
 }
 
-
-bool Acceptor::onAccept( ConnectionPtr connection, const std::string& host, uint16_t port )
+bool Sapphire::Network::Acceptor::onAccept( ConnectionPtr connection, const std::string& host, uint16_t port )
 {
   return true;
 }
 
-void Acceptor::onError( const asio::error_code& error )
+void Sapphire::Network::Acceptor::onError( const asio::error_code& error )
 {
 
 }
 
-void Acceptor::startError( const asio::error_code& error )
+void Sapphire::Network::Acceptor::startError( const asio::error_code& error )
 {
   uint32_t v1 = 1;
   uint32_t v2 = 0;
@@ -43,7 +37,7 @@ void Acceptor::startError( const asio::error_code& error )
   }
 }
 
-void Acceptor::dispatchAccept( ConnectionPtr connection )
+void Sapphire::Network::Acceptor::dispatchAccept( ConnectionPtr connection )
 {
   m_acceptor.async_accept( connection->getSocket(),
                            connection->getStrand().wrap( std::bind( &Acceptor::handleAccept,
@@ -52,7 +46,7 @@ void Acceptor::dispatchAccept( ConnectionPtr connection )
                                                                     connection ) ) );
 }
 
-void Acceptor::handleAccept( const asio::error_code& error, ConnectionPtr connection )
+void Sapphire::Network::Acceptor::handleAccept( const asio::error_code& error, ConnectionPtr connection )
 {
   if( error || hasError() || m_hive->hasStopped() )
   {
@@ -78,17 +72,17 @@ void Acceptor::handleAccept( const asio::error_code& error, ConnectionPtr connec
   }
 }
 
-void Acceptor::stop()
+void Sapphire::Network::Acceptor::stop()
 {
 
 }
 
-void Acceptor::accept( ConnectionPtr connection )
+void Sapphire::Network::Acceptor::accept( ConnectionPtr connection )
 {
   m_io_strand.post( std::bind( &Acceptor::dispatchAccept, shared_from_this(), connection ) );
 }
 
-void Acceptor::listen( const std::string& host, const uint16_t& port )
+void Sapphire::Network::Acceptor::listen( const std::string& host, const uint16_t& port )
 {
   try
   {
@@ -109,21 +103,19 @@ void Acceptor::listen( const std::string& host, const uint16_t& port )
 
 }
 
-HivePtr Acceptor::getHive()
+Sapphire::Network::HivePtr Sapphire::Network::Acceptor::getHive()
 {
   return m_hive;
 }
 
-asio::ip::tcp::acceptor& Acceptor::getAcceptor()
+asio::ip::tcp::acceptor& Sapphire::Network::Acceptor::getAcceptor()
 {
   return m_acceptor;
 }
 
-bool Acceptor::hasError()
+bool Sapphire::Network::Acceptor::hasError()
 {
   uint32_t v1 = 1;
   uint32_t v2 = 1;
   return ( m_error_state.compare_exchange_strong( v1, v2 ) );
-}
-
-}
+}
\ No newline at end of file
diff --git a/src/common/Network/Connection.cpp b/src/common/Network/Connection.cpp
index f6436cb3..21e8bee7 100644
--- a/src/common/Network/Connection.cpp
+++ b/src/common/Network/Connection.cpp
@@ -3,11 +3,7 @@
 #include <functional>
 #include "Framework.h"
 
-namespace Sapphire::Network 
-{
-//-----------------------------------------------------------------------------
-
-Connection::Connection( HivePtr hive, FrameworkPtr pFw ) :
+Sapphire::Network::Connection::Connection( HivePtr hive, FrameworkPtr pFw ) :
   m_hive( hive ),
   m_socket( hive->getService() ),
   m_io_strand( hive->getService() ),
@@ -17,11 +13,11 @@ Connection::Connection( HivePtr hive, FrameworkPtr pFw ) :
 {
 }
 
-Connection::~Connection()
+Sapphire::Network::Connection::~Connection()
 {
 }
 
-void Connection::bind( const std::string& ip, uint16_t port )
+void Sapphire::Network::Connection::bind( const std::string& ip, uint16_t port )
 {
   asio::ip::tcp::endpoint endpoint( asio::ip::address::from_string( ip ), port );
   m_socket.open( endpoint.protocol() );
@@ -29,7 +25,7 @@ void Connection::bind( const std::string& ip, uint16_t port )
   m_socket.bind( endpoint );
 }
 
-void Connection::startSend()
+void Sapphire::Network::Connection::startSend()
 {
   if( !m_pending_sends.empty() )
   {
@@ -42,7 +38,7 @@ void Connection::startSend()
   }
 }
 
-void Connection::startRecv( int32_t total_bytes )
+void Sapphire::Network::Connection::startRecv( int32_t total_bytes )
 {
   if( total_bytes > 0 )
   {
@@ -65,7 +61,7 @@ void Connection::startRecv( int32_t total_bytes )
   }
 }
 
-void Connection::startError( const asio::error_code& error )
+void Sapphire::Network::Connection::startError( const asio::error_code& error )
 {
   uint32_t v1 = 1;
   uint32_t v2 = 0;
@@ -78,7 +74,7 @@ void Connection::startError( const asio::error_code& error )
   }
 }
 
-void Connection::handleConnect( const asio::error_code& error )
+void Sapphire::Network::Connection::handleConnect( const asio::error_code& error )
 {
   if( error || hasError() || m_hive->hasStopped() )
   {
@@ -98,8 +94,8 @@ void Connection::handleConnect( const asio::error_code& error )
   }
 }
 
-void
-Connection::handleSend( const asio::error_code& error, std::list< std::vector< uint8_t > >::iterator itr )
+void Sapphire::Network::Connection::handleSend( const asio::error_code& error,
+                                                std::list< std::vector< uint8_t > >::iterator itr )
 {
   if( error || hasError() || m_hive->hasStopped() )
   {
@@ -113,7 +109,7 @@ Connection::handleSend( const asio::error_code& error, std::list< std::vector< u
   }
 }
 
-void Connection::handleRecv( const asio::error_code& error, int32_t actual_bytes )
+void Sapphire::Network::Connection::handleRecv( const asio::error_code& error, int32_t actual_bytes )
 {
   if( error || hasError() || m_hive->hasStopped() )
   {
@@ -132,7 +128,7 @@ void Connection::handleRecv( const asio::error_code& error, int32_t actual_bytes
   }
 }
 
-void Connection::dispatchSend( std::vector< uint8_t > buffer )
+void Sapphire::Network::Connection::dispatchSend( std::vector< uint8_t > buffer )
 {
   bool should_start_send = m_pending_sends.empty();
   m_pending_sends.push_back( buffer );
@@ -142,7 +138,7 @@ void Connection::dispatchSend( std::vector< uint8_t > buffer )
   }
 }
 
-void Connection::dispatchRecv( int32_t total_bytes )
+void Sapphire::Network::Connection::dispatchRecv( int32_t total_bytes )
 {
   bool should_start_receive = m_pending_recvs.empty();
   m_pending_recvs.push_back( total_bytes );
@@ -153,61 +149,61 @@ void Connection::dispatchRecv( int32_t total_bytes )
 }
 
 
-void Connection::connect( const std::string& host, uint16_t port )
+void Sapphire::Network::Connection::connect( const std::string& host, uint16_t port )
 {
   asio::ip::tcp::resolver resolver( m_hive->getService() );
   asio::ip::tcp::resolver::query query( host, std::to_string( port ) );
   asio::ip::tcp::resolver::iterator iterator = resolver.resolve( query );
   m_socket.async_connect( *iterator,
-                          m_io_strand.wrap( std::bind( &Connection::handleConnect, shared_from_this(), std::placeholders::_1 ) ) );
+                          m_io_strand.wrap( std::bind( &Connection::handleConnect,
+                          shared_from_this(), std::placeholders::_1 ) ) );
 
 }
 
-void Connection::disconnect()
+void Sapphire::Network::Connection::disconnect()
 {
   onDisconnect();
   m_socket.close();
 }
 
-void Connection::recv( int32_t total_bytes )
+void Sapphire::Network::Connection::recv( int32_t total_bytes )
 {
   m_io_strand.post( std::bind( &Connection::dispatchRecv, shared_from_this(), total_bytes ) );
 }
 
-void Connection::send( const std::vector< uint8_t >& buffer )
+void Sapphire::Network::Connection::send( const std::vector< uint8_t >& buffer )
 {
   m_io_strand.post( std::bind( &Connection::dispatchSend, shared_from_this(), buffer ) );
 }
 
-asio::ip::tcp::socket& Connection::getSocket()
+asio::ip::tcp::socket& Sapphire::Network::Connection::getSocket()
 {
   return m_socket;
 }
 
-asio::strand& Connection::getStrand()
+asio::strand& Sapphire::Network::Connection::getStrand()
 {
   return m_io_strand;
 }
 
-HivePtr Connection::getHive()
+Sapphire::Network::HivePtr Sapphire::Network::Connection::getHive()
 {
   return m_hive;
 }
 
-void Connection::setReceiveBufferSize( int32_t size )
+void Sapphire::Network::Connection::setReceiveBufferSize( int32_t size )
 {
   m_receive_buffer_size = size;
 }
 
-int32_t Connection::getReceiveBufferSize() const
+int32_t Sapphire::Network::Connection::getReceiveBufferSize() const
 {
   return m_receive_buffer_size;
 }
 
-bool Connection::hasError()
+bool Sapphire::Network::Connection::hasError()
 {
   uint32_t v1 = 1;
   uint32_t v2 = 1;
   return ( m_error_state.compare_exchange_strong( v1, v2 ) );
-}
-}
+}
\ No newline at end of file
diff --git a/src/common/Network/Connection.h b/src/common/Network/Connection.h
index b0ee7b2a..fbfc85c9 100644
--- a/src/common/Network/Connection.h
+++ b/src/common/Network/Connection.h
@@ -22,9 +22,7 @@ namespace Sapphire::Network
 {
 
   class Hive;
-
   class Acceptor;
-
   class Connection;
 
   //-----------------------------------------------------------------------------
@@ -32,7 +30,6 @@ namespace Sapphire::Network
   class Connection : public std::enable_shared_from_this< Connection >
   {
     friend class Acceptor;
-
     friend class Hive;
 
   protected:
diff --git a/src/common/Network/GamePacket.h b/src/common/Network/GamePacket.h
index 3f72811c..f62c08ef 100644
--- a/src/common/Network/GamePacket.h
+++ b/src/common/Network/GamePacket.h
@@ -1,5 +1,5 @@
-#ifndef _GAMEPACKET_NEW_H
-#define _GAMEPACKET_NEW_H
+#ifndef _GAMEPACKET_H
+#define _GAMEPACKET_H
 
 #include <stdint.h>
 #include <iostream>
@@ -17,320 +17,318 @@
 namespace Sapphire::Network::Packets
 {
 
-// Must forward define these in order to enable the compiler to produce the
-// correct template functions.
+  // Must forward define these in order to enable the compiler to produce the
+  // correct template functions.
+  template< typename T, typename T1 >
+  class FFXIVIpcPacket;
 
-template< typename T, typename T1 >
-class FFXIVIpcPacket;
+  template< class T >
+  using ZoneChannelPacket = FFXIVIpcPacket< T, ServerZoneIpcType >;
 
-template< class T >
-using ZoneChannelPacket = FFXIVIpcPacket< T, ServerZoneIpcType >;
+  template< class T >
+  using ChatChannelPacket = FFXIVIpcPacket< T, ServerChatIpcType >;
 
-template< class T >
-using ChatChannelPacket = FFXIVIpcPacket< T, ServerChatIpcType >;
-
-template< class T >
-using LobbyChannelPacket = FFXIVIpcPacket< T, ServerLobbyIpcType >;
+  template< class T >
+  using LobbyChannelPacket = FFXIVIpcPacket< T, ServerLobbyIpcType >;
 
 
-template< class T, typename... Args >
-std::shared_ptr< ZoneChannelPacket< T > > makeZonePacket( Args... args )
-{
-  return std::make_shared< ZoneChannelPacket< T > >( args... );
-}
-
-template< class T, typename... Args >
-std::shared_ptr< T > makeWrappedPacket( Args... args )
-{
-  return std::make_shared< T >( args... );
-}
-
-template< class T, typename... Args >
-std::shared_ptr< ChatChannelPacket< T > > makeChatPacket( Args... args )
-{
-  return std::make_shared< ChatChannelPacket< T > >( args... );
-}
-
-template< class T, typename... Args >
-std::shared_ptr< LobbyChannelPacket< T > > makeLobbyPacket( Args... args )
-{
-  return std::make_shared< LobbyChannelPacket< T > >( args... );
-}
-
-/**
-* The base implementation of a game packet. Needed for parsing packets.
-*/
-template< typename T1 >
-class FFXIVIpcPacketBase
-{
-public:
-  virtual ~FFXIVIpcPacketBase() = default;
-
-  /**
-  * @brief Gets the IPC type of this packet. (Useful for determining the
-  * type of a parsed packet.)
-  */
-  virtual T1 ipcType() = 0;
-};
-
-////////////////////////////////////////////////7
-
-class FFXIVPacketBase
-{
-public:
-  FFXIVPacketBase() :
-    m_segmentType( 0 )
+  template< class T, typename... Args >
+  std::shared_ptr< ZoneChannelPacket< T > > makeZonePacket( Args... args )
   {
-    initializeSegmentHeader();
+    return std::make_shared< ZoneChannelPacket< T > >( args... );
   }
 
-  FFXIVPacketBase( uint16_t segmentType, uint32_t sourceActorId, uint32_t targetActorId ) :
-    m_segmentType( segmentType )
+  template< class T, typename... Args >
+  std::shared_ptr< T > makeWrappedPacket( Args... args )
   {
-    initializeSegmentHeader();
-    setSourceActor( sourceActorId );
-    setTargetActor( targetActorId );
+    return std::make_shared< T >( args... );
   }
 
-  std::size_t getSize() const
+  template< class T, typename... Args >
+  std::shared_ptr< ChatChannelPacket< T > > makeChatPacket( Args... args )
   {
-    return m_segHdr.size;
+    return std::make_shared< ChatChannelPacket< T > >( args... );
   }
 
-  virtual std::vector< uint8_t > getData() const
+  template< class T, typename... Args >
+  std::shared_ptr< LobbyChannelPacket< T > > makeLobbyPacket( Args... args )
   {
-    return {};
-  }
-
-protected:
-  /** The segment header */
-  FFXIVARR_PACKET_SEGMENT_HEADER m_segHdr;
-  uint16_t m_segmentType;
-
-public:
-  virtual size_t getContentSize()
-  {
-    return 0;
-  };
-
-  virtual std::vector< uint8_t > getContent()
-  {
-    return {};
-  };
-
-  /**
-  * @brief Gets the segment type of this packet.
-  */
-  uint16_t getSegmentType() const
-  {
-    return m_segmentType;
+    return std::make_shared< LobbyChannelPacket< T > >( args... );
   }
 
   /**
-  * @brief Sets the source actor id for this packet.
-  * @param actorId The source actor id.
+  * The base implementation of a game packet. Needed for parsing packets.
   */
-  void setSourceActor( uint32_t actorId )
+  template< typename T1 >
+  class FFXIVIpcPacketBase
   {
-    m_segHdr.source_actor = actorId;
+  public:
+    virtual ~FFXIVIpcPacketBase() = default;
+
+    /**
+    * @brief Gets the IPC type of this packet. (Useful for determining the
+    * type of a parsed packet.)
+    */
+    virtual T1 ipcType() = 0;
   };
 
-  /**
-  * @brief Gets the source actor id for this packet.
-  * @return The source actor id.
-  */
-  uint32_t getSourceActor() const
+  ////////////////////////////////////////////////7
+
+  class FFXIVPacketBase
   {
-    return m_segHdr.source_actor;
+  public:
+    FFXIVPacketBase() :
+      m_segmentType( 0 )
+    {
+      initializeSegmentHeader();
+    }
+
+    FFXIVPacketBase( uint16_t segmentType, uint32_t sourceActorId, uint32_t targetActorId ) :
+      m_segmentType( segmentType )
+    {
+      initializeSegmentHeader();
+      setSourceActor( sourceActorId );
+      setTargetActor( targetActorId );
+    }
+
+    std::size_t getSize() const
+    {
+      return m_segHdr.size;
+    }
+
+    virtual std::vector< uint8_t > getData() const
+    {
+      return {};
+    }
+
+  protected:
+    /** The segment header */
+    FFXIVARR_PACKET_SEGMENT_HEADER m_segHdr;
+    uint16_t m_segmentType;
+
+  public:
+    virtual size_t getContentSize()
+    {
+      return 0;
+    };
+
+    virtual std::vector< uint8_t > getContent()
+    {
+      return {};
+    };
+
+    /**
+    * @brief Gets the segment type of this packet.
+    */
+    uint16_t getSegmentType() const
+    {
+      return m_segmentType;
+    }
+
+    /**
+    * @brief Sets the source actor id for this packet.
+    * @param actorId The source actor id.
+    */
+    void setSourceActor( uint32_t actorId )
+    {
+      m_segHdr.source_actor = actorId;
+    };
+
+    /**
+    * @brief Gets the source actor id for this packet.
+    * @return The source actor id.
+    */
+    uint32_t getSourceActor() const
+    {
+      return m_segHdr.source_actor;
+    };
+
+    /**
+    * @brief Sets the target actor id for this packet.
+    * @param actorId The target actor id.
+    */
+    void setTargetActor( uint32_t actorId )
+    {
+      m_segHdr.target_actor = actorId;
+    };
+
+    /**
+    * @brief Gets the target actor id for this packet.
+    */
+    uint32_t getTargetActor( void ) const
+    {
+      return m_segHdr.target_actor;
+    };
+
+    /** Initializes the fields of the segment header structure */
+    virtual void initializeSegmentHeader( void )
+    {
+      // Zero out the structure.
+      memset( &m_segHdr, 0, sizeof( FFXIVARR_PACKET_SEGMENT_HEADER ) );
+
+      // Set the values of static fields.
+      // The size must be the sum of the segment header and the content
+      m_segHdr.size = static_cast< uint32_t >( sizeof( FFXIVARR_PACKET_SEGMENT_HEADER ) + getContentSize() );
+      m_segHdr.type = getSegmentType();
+    }
+
   };
 
-  /**
-  * @brief Sets the target actor id for this packet.
-  * @param actorId The target actor id.
-  */
-  void setTargetActor( uint32_t actorId )
+  template< typename T, typename T1 >
+  class FFXIVIpcPacket :
+    public FFXIVIpcPacketBase< T1 >, public FFXIVPacketBase
   {
-    m_segHdr.target_actor = actorId;
+  public:
+    FFXIVIpcPacket< T, T1 >( uint32_t sourceActorId, uint32_t targetActorId ) :
+      FFXIVPacketBase( 3, sourceActorId, targetActorId )
+    {
+      initialize();
+    };
+
+    FFXIVIpcPacket< T, T1 >( uint32_t sourceActorId ) :
+      FFXIVPacketBase( 3, sourceActorId, sourceActorId )
+    {
+      initialize();
+    };
+
+    FFXIVIpcPacket< T, T1 >( const FFXIVARR_PACKET_RAW& rawPacket )
+    {
+      auto ipcHdrSize = sizeof( FFXIVARR_IPC_HEADER );
+      auto copySize = std::min< size_t >( sizeof( T ), rawPacket.segHdr.size - ipcHdrSize );
+
+      memcpy( &m_segHdr, &rawPacket.segHdr, sizeof( FFXIVARR_PACKET_SEGMENT_HEADER ) );
+      memcpy( &m_data, &rawPacket.data[ 0 ] + ipcHdrSize, copySize );
+
+      memset( &m_ipcHdr, 0, ipcHdrSize );
+      m_ipcHdr.type = static_cast< ServerZoneIpcType >( m_data._ServerIpcType );
+    }
+
+    size_t getContentSize() override
+    {
+      return sizeof( FFXIVARR_IPC_HEADER ) + sizeof( T );
+    }
+
+    std::vector< uint8_t > getContent() override
+    {
+      std::vector< uint8_t > content( getContentSize() );
+      memcpy( content.data(), &m_ipcHdr, sizeof( FFXIVARR_IPC_HEADER ) );
+      memcpy( content.data() + sizeof( FFXIVARR_IPC_HEADER ), &m_data, sizeof( T ) );
+      return content;
+    }
+
+    std::vector< uint8_t > getData() const override
+    {
+      auto segmentHeaderSize = sizeof( FFXIVARR_PACKET_SEGMENT_HEADER );
+      auto ipcHeaderSize = sizeof( FFXIVARR_IPC_HEADER );
+      auto dataSize = sizeof( m_data );
+
+      std::vector< uint8_t > data( segmentHeaderSize + ipcHeaderSize + dataSize );
+
+      memcpy( &data[ 0 ], &m_segHdr, segmentHeaderSize );
+      memcpy( &data[ segmentHeaderSize ], &m_ipcHdr, ipcHeaderSize );
+      memcpy( &data[ segmentHeaderSize + ipcHeaderSize ], &m_data, dataSize );
+
+      return data;
+    }
+
+    T1 ipcType() override
+    {
+      return static_cast< T1 >( m_data._ServerIpcType );
+    };
+
+    /** Gets a reference to the underlying IPC data structure. */
+    T& data()
+    {
+      return m_data;
+    };
+
+    const T& data() const
+    {
+      return m_data;
+    }
+
+  protected:
+    /** Initializes the fields of the header structures */
+    virtual void initialize()
+    {
+      // Zero out the structures.
+      memset( &m_ipcHdr, 0, sizeof( FFXIVARR_IPC_HEADER ) );
+      memset( &m_data, 0, sizeof( T ) );
+
+      // The IPC type itself.
+      m_ipcHdr.type = static_cast< ServerZoneIpcType >( m_data._ServerIpcType );
+      m_ipcHdr.timestamp = Util::getTimeSeconds();
+      m_segHdr.size = sizeof( T ) + sizeof( FFXIVARR_IPC_HEADER ) + sizeof( FFXIVARR_PACKET_SEGMENT_HEADER );
+    };
+
+  protected:
+    /** The IPC packet header */
+    FFXIVARR_IPC_HEADER m_ipcHdr;
+    /** The underlying data portion of the packet as a structure */
+    T m_data;
   };
 
-  /**
-  * @brief Gets the target actor id for this packet.
-  */
-  uint32_t getTargetActor( void ) const
+
+  class FFXIVRawPacket :
+    public FFXIVPacketBase
   {
-    return m_segHdr.target_actor;
+  public:
+    FFXIVRawPacket( uint16_t type, uint32_t size, uint32_t sourceActorId, uint32_t targetActorId ) :
+      m_data( std::vector< uint8_t >( size - sizeof( FFXIVARR_PACKET_SEGMENT_HEADER ) ) ),
+      FFXIVPacketBase( type, sourceActorId, targetActorId )
+    {
+      initialize();
+      m_segHdr.size = size;
+    };
+
+    FFXIVRawPacket( char* data, uint16_t size ) :
+      m_data( std::vector< uint8_t >( size ) )
+    {
+      auto segmentHdrSize = sizeof( FFXIVARR_PACKET_SEGMENT_HEADER );
+
+      memcpy( &m_data[ 0 ], data + segmentHdrSize, size - segmentHdrSize );
+      memcpy( &m_segHdr, data, segmentHdrSize );
+    }
+
+    size_t getContentSize() override
+    {
+      return m_data.size();
+    }
+
+    std::vector< uint8_t > getContent() override
+    {
+      return m_data;
+    }
+
+    virtual std::vector< uint8_t > getData() const override
+    {
+      std::vector< uint8_t > data( sizeof( FFXIVARR_PACKET_SEGMENT_HEADER ) + m_data.size() );
+
+      memcpy( &data[ 0 ], &m_segHdr, sizeof( FFXIVARR_PACKET_SEGMENT_HEADER ) );
+      memcpy( &data[ sizeof( FFXIVARR_PACKET_SEGMENT_HEADER ) ], &m_data[ 0 ], m_data.size() );
+
+      return data;
+    }
+
+    /** Gets a reference to the underlying IPC data structure. */
+    std::vector< uint8_t >& data()
+    {
+      return m_data;
+    };
+
+  protected:
+    /** Initializes the fields of the header structures */
+    virtual void initialize()
+    {
+      // Zero out the structures.
+      memset( &m_data[ 0 ], 0, m_data.size() );
+    };
+
+  protected:
+    /** The underlying data portion of the packet as a structure */
+    std::vector< uint8_t > m_data;
   };
 
-  /** Initializes the fields of the segment header structure */
-  virtual void initializeSegmentHeader( void )
-  {
-    // Zero out the structure.
-    memset( &m_segHdr, 0, sizeof( FFXIVARR_PACKET_SEGMENT_HEADER ) );
-
-    // Set the values of static fields.
-    // The size must be the sum of the segment header and the content
-    m_segHdr.size = static_cast< uint32_t >( sizeof( FFXIVARR_PACKET_SEGMENT_HEADER ) + getContentSize() );
-    m_segHdr.type = getSegmentType();
-  }
-
-};
-
-template< typename T, typename T1 >
-class FFXIVIpcPacket :
-  public FFXIVIpcPacketBase< T1 >, public FFXIVPacketBase
-{
-public:
-  FFXIVIpcPacket< T, T1 >( uint32_t sourceActorId, uint32_t targetActorId ) :
-    FFXIVPacketBase( 3, sourceActorId, targetActorId )
-  {
-    initialize();
-  };
-
-  FFXIVIpcPacket< T, T1 >( uint32_t sourceActorId ) :
-    FFXIVPacketBase( 3, sourceActorId, sourceActorId )
-  {
-    initialize();
-  };
-
-  FFXIVIpcPacket< T, T1 >( const FFXIVARR_PACKET_RAW& rawPacket )
-  {
-    auto ipcHdrSize = sizeof( FFXIVARR_IPC_HEADER );
-    auto copySize = std::min< size_t >( sizeof( T ), rawPacket.segHdr.size - ipcHdrSize );
-
-    memcpy( &m_segHdr, &rawPacket.segHdr, sizeof( FFXIVARR_PACKET_SEGMENT_HEADER ) );
-    memcpy( &m_data, &rawPacket.data[ 0 ] + ipcHdrSize, copySize );
-
-    memset( &m_ipcHdr, 0, ipcHdrSize );
-    m_ipcHdr.type = static_cast< ServerZoneIpcType >( m_data._ServerIpcType );
-  }
-
-  size_t getContentSize() override
-  {
-    return sizeof( FFXIVARR_IPC_HEADER ) + sizeof( T );
-  }
-
-  std::vector< uint8_t > getContent() override
-  {
-    std::vector< uint8_t > content( getContentSize() );
-    memcpy( content.data(), &m_ipcHdr, sizeof( FFXIVARR_IPC_HEADER ) );
-    memcpy( content.data() + sizeof( FFXIVARR_IPC_HEADER ), &m_data, sizeof( T ) );
-    return content;
-  }
-
-  std::vector< uint8_t > getData() const override
-  {
-    auto segmentHeaderSize = sizeof( FFXIVARR_PACKET_SEGMENT_HEADER );
-    auto ipcHeaderSize = sizeof( FFXIVARR_IPC_HEADER );
-    auto dataSize = sizeof( m_data );
-
-    std::vector< uint8_t > data( segmentHeaderSize + ipcHeaderSize + dataSize );
-
-    memcpy( &data[ 0 ], &m_segHdr, segmentHeaderSize );
-    memcpy( &data[ segmentHeaderSize ], &m_ipcHdr, ipcHeaderSize );
-    memcpy( &data[ segmentHeaderSize + ipcHeaderSize ], &m_data, dataSize );
-
-    return data;
-  }
-
-  T1 ipcType() override
-  {
-    return static_cast< T1 >( m_data._ServerIpcType );
-  };
-
-  /** Gets a reference to the underlying IPC data structure. */
-  T& data()
-  {
-    return m_data;
-  };
-
-  const T& data() const
-  {
-    return m_data;
-  }
-
-protected:
-  /** Initializes the fields of the header structures */
-  virtual void initialize()
-  {
-    // Zero out the structures.
-    memset( &m_ipcHdr, 0, sizeof( FFXIVARR_IPC_HEADER ) );
-    memset( &m_data, 0, sizeof( T ) );
-
-    // The IPC type itself.
-    m_ipcHdr.type = static_cast< ServerZoneIpcType >( m_data._ServerIpcType );
-    m_ipcHdr.timestamp = Util::getTimeSeconds();
-    m_segHdr.size = sizeof( T ) + sizeof( FFXIVARR_IPC_HEADER ) + sizeof( FFXIVARR_PACKET_SEGMENT_HEADER );
-  };
-
-protected:
-  /** The IPC packet header */
-  FFXIVARR_IPC_HEADER m_ipcHdr;
-  /** The underlying data portion of the packet as a structure */
-  T m_data;
-};
-
-
-class FFXIVRawPacket :
-  public FFXIVPacketBase
-{
-public:
-  FFXIVRawPacket( uint16_t type, uint32_t size, uint32_t sourceActorId, uint32_t targetActorId ) :
-    m_data( std::vector< uint8_t >( size - sizeof( FFXIVARR_PACKET_SEGMENT_HEADER ) ) ),
-    FFXIVPacketBase( type, sourceActorId, targetActorId )
-  {
-    initialize();
-    m_segHdr.size = size;
-  };
-
-  FFXIVRawPacket( char* data, uint16_t size ) :
-    m_data( std::vector< uint8_t >( size ) )
-  {
-    auto segmentHdrSize = sizeof( FFXIVARR_PACKET_SEGMENT_HEADER );
-
-    memcpy( &m_data[ 0 ], data + segmentHdrSize, size - segmentHdrSize );
-    memcpy( &m_segHdr, data, segmentHdrSize );
-  }
-
-  size_t getContentSize() override
-  {
-    return m_data.size();
-  }
-
-  std::vector< uint8_t > getContent() override
-  {
-    return m_data;
-  }
-
-  virtual std::vector< uint8_t > getData() const override
-  {
-    std::vector< uint8_t > data( sizeof( FFXIVARR_PACKET_SEGMENT_HEADER ) + m_data.size() );
-
-    memcpy( &data[ 0 ], &m_segHdr, sizeof( FFXIVARR_PACKET_SEGMENT_HEADER ) );
-    memcpy( &data[ sizeof( FFXIVARR_PACKET_SEGMENT_HEADER ) ], &m_data[ 0 ], m_data.size() );
-
-    return data;
-  }
-
-  /** Gets a reference to the underlying IPC data structure. */
-  std::vector< uint8_t >& data()
-  {
-    return m_data;
-  };
-
-protected:
-  /** Initializes the fields of the header structures */
-  virtual void initialize()
-  {
-    // Zero out the structures.
-    memset( &m_data[ 0 ], 0, m_data.size() );
-  };
-
-protected:
-  /** The underlying data portion of the packet as a structure */
-  std::vector< uint8_t > m_data;
-};
-
-
 }
 
-#endif /*_CORE_NETWORK_PACKETS_CGAMEPACKETNEW_H*/
\ No newline at end of file
+#endif
\ No newline at end of file
diff --git a/src/common/Network/Hive.cpp b/src/common/Network/Hive.cpp
index 11286e4c..86460b2d 100644
--- a/src/common/Network/Hive.cpp
+++ b/src/common/Network/Hive.cpp
@@ -2,44 +2,41 @@
 #include <functional>
 #include "Hive.h"
 
-namespace Sapphire::Network
-{
-
 //-----------------------------------------------------------------------------
 
-Hive::Hive() :
+Sapphire::Network::Hive::Hive() :
   m_work_ptr( new asio::io_service::work( m_io_service ) ),
   m_shutdown( 0 )
 {
 }
 
-Hive::~Hive()
+Sapphire::Network::Hive::~Hive()
 {
 }
 
-asio::io_service& Hive::getService()
+asio::io_service& Sapphire::Network::Hive::getService()
 {
   return m_io_service;
 }
 
-bool Hive::hasStopped()
+bool Sapphire::Network::Hive::hasStopped()
 {
   uint32_t v1 = 1;
   uint32_t v2 = 1;
   return m_shutdown.compare_exchange_strong( v1, v2 );
 }
 
-void Hive::poll()
+void Sapphire::Network::Hive::poll()
 {
   m_io_service.poll();
 }
 
-void Hive::run()
+void Sapphire::Network::Hive::run()
 {
   m_io_service.run();
 }
 
-void Hive::stop()
+void Sapphire::Network::Hive::stop()
 {
   uint32_t v1 = 1;
   uint32_t v2 = 0;
@@ -51,7 +48,7 @@ void Hive::stop()
   }
 }
 
-void Hive::reset()
+void Sapphire::Network::Hive::reset()
 {
   uint32_t v1 = 0;
   uint32_t v2 = 1;
@@ -61,5 +58,3 @@ void Hive::reset()
     m_work_ptr.reset( new asio::io_service::work( m_io_service ) );
   }
 }
-
-}
diff --git a/src/common/Network/PacketContainer.h b/src/common/Network/PacketContainer.h
index 07667e00..80a35cf1 100644
--- a/src/common/Network/PacketContainer.h
+++ b/src/common/Network/PacketContainer.h
@@ -12,7 +12,6 @@ namespace Sapphire::Network::Packets
 {
 
   using FFXIVPacketBasePtr = std::shared_ptr< FFXIVPacketBase >;
-
   class PacketContainer
   {
   public:
diff --git a/src/common/Util/SpawnIndexAllocator.h b/src/common/Util/SpawnIndexAllocator.h
index 500339eb..f03951a3 100644
--- a/src/common/Util/SpawnIndexAllocator.h
+++ b/src/common/Util/SpawnIndexAllocator.h
@@ -9,7 +9,6 @@ namespace Sapphire::Util
 {
 
   template< typename T, typename ActorIdType = uint32_t >
-
   class SpawnIndexAllocator
   {
   public:
diff --git a/src/common/Util/Util.h b/src/common/Util/Util.h
index faea94c6..4c4a5a32 100644
--- a/src/common/Util/Util.h
+++ b/src/common/Util/Util.h
@@ -32,7 +32,7 @@ namespace Sapphire::Util
 
   void valueToFlagByteIndexValue( uint32_t inVal, uint8_t& outVal, uint16_t& outIndex );
 
-  template <class T>
+  template< class T >
   inline void hashCombine( std::size_t& seed, const T& v )
   {
       std::hash< T > hasher;
diff --git a/src/scripts/CMakeLists.txt b/src/scripts/CMakeLists.txt
index 8a08672f..c049a97f 100644
--- a/src/scripts/CMakeLists.txt
+++ b/src/scripts/CMakeLists.txt
@@ -55,8 +55,8 @@ foreach(_scriptDir ${children})
 
         configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ScriptLoader.cpp.in" "${_scriptDir}/ScriptLoader.cpp")
 
-	if( UNIX )
-          cotire("script_${_name}")
+        if( UNIX )
+            cotire("script_${_name}")
         endif()
 
         if(MSVC)
diff --git a/src/world/Actor/BNpc.h b/src/world/Actor/BNpc.h
index 429203ec..facf2916 100644
--- a/src/world/Actor/BNpc.h
+++ b/src/world/Actor/BNpc.h
@@ -13,11 +13,11 @@
 namespace Sapphire::Entity
 {
 
-  typedef struct
+  using HateListEntry = struct
   {
     uint32_t m_hateAmount;
     CharaPtr m_pChara;
-  } HateListEntry;
+  };
 
   enum class BNpcState
   {
diff --git a/src/world/Actor/BNpcTemplate.h b/src/world/Actor/BNpcTemplate.h
index 953398d3..a9958579 100644
--- a/src/world/Actor/BNpcTemplate.h
+++ b/src/world/Actor/BNpcTemplate.h
@@ -25,7 +25,7 @@ namespace Sapphire::Entity
     uint8_t m_customize[26];
 
   public:
-    BNpcTemplate() {};
+    BNpcTemplate() = default;
 
     BNpcTemplate( uint32_t id, uint32_t baseId, uint32_t nameId, uint64_t weaponMain, uint64_t weaponSub, uint8_t aggressionMode,
                   uint8_t enemyType, uint8_t onlineStatus, uint8_t pose, uint16_t modelChara,
diff --git a/src/world/Actor/Player.h b/src/world/Actor/Player.h
index fb4f80ca..cbc8e680 100644
--- a/src/world/Actor/Player.h
+++ b/src/world/Actor/Player.h
@@ -60,9 +60,8 @@ namespace Sapphire::Entity
                                Action::ActionCallback interruptCallback, uint64_t additional );
 
     /*! start/register a normal event */
-    void
-    eventStart( uint64_t actorId, uint32_t eventId, Event::EventHandler::EventType eventParam, uint8_t eventParam1,
-                uint32_t eventParam2, Event::EventHandler::EventFinishCallback callback = nullptr );
+    void eventStart( uint64_t actorId, uint32_t eventId, Event::EventHandler::EventType eventParam, uint8_t eventParam1,
+                     uint32_t eventParam2, Event::EventHandler::EventFinishCallback callback = nullptr );
 
     /*! play a subevent */
     void playScene( uint32_t eventId, uint32_t scene, uint32_t flags, uint32_t eventParam2, uint32_t eventParam3 );
@@ -70,9 +69,8 @@ namespace Sapphire::Entity
     void playGilShop( uint32_t eventId, uint32_t flags,
                       Event::EventHandler::SceneReturnCallback eventCallback );
 
-    void
-    directorPlayScene( uint32_t eventId, uint32_t scene, uint32_t flags, uint32_t eventParam3, uint32_t eventParam4,
-                       uint32_t eventParam5 = 0 );
+    void directorPlayScene( uint32_t eventId, uint32_t scene, uint32_t flags, uint32_t eventParam3,
+                            uint32_t eventParam4, uint32_t eventParam5 = 0 );
 
     /*! play a subevent */
     void playScene( uint32_t eventId, uint32_t scene, uint32_t flags,