diff --git a/source/game/game.h b/source/game/game.h
index f672e1b..99896ea 100644
--- a/source/game/game.h
+++ b/source/game/game.h
@@ -33,7 +33,7 @@ public:
     // Check for a win, returns invalid for no win state reached
     // Note: this function will return invalid a draw was reached
     //       best practice would be to call with GetNumUnits() == 0
-    player_t CheckForWin() const;
+    player_t                CheckForWin() const;
 
     // Get the game information as a string
     std::string             GetStateAsString() const;
@@ -52,11 +52,11 @@ public:
 
 	// Get unit and orderby index as above (not unit ID)
     inline const CUnit&     GetUnitByIndex( unsigned int i ) const      { return m_OrderUnitPairs[i].unit; }
-    inline const SOrder &    GetOrdersByIndex( unsigned int i ) const   { return m_OrderUnitPairs[i].order; }
+    inline const SOrder &   GetOrdersByIndex( unsigned int i ) const   { return m_OrderUnitPairs[i].order; }
 
     // Get a unit by it's ID
     const CUnit&            GetUnitByIDConst( unit_id_t id ) const;
-    const SOrder &           GetOrderByIDConst( unit_id_t id ) const;
+    const SOrder &          GetOrderByIDConst( unit_id_t id ) const;
 
     // Get dimensions
     inline const uvector2&  GetDimensions() const { return dimensions; }
@@ -71,7 +71,7 @@ public:
     inline int              GetTurn() const   { return turn; }
 
     // Get a vector of the players in the current game
-    std::vector<player_t>       GetPlayers() const;
+    std::vector<player_t>   GetPlayers() const;
 
 private:
 
diff --git a/source/game/unit.h b/source/game/unit.h
index 982f140..ce9295f 100644
--- a/source/game/unit.h
+++ b/source/game/unit.h
@@ -38,13 +38,13 @@ public:
 	inline const unit_id_t&		GetID() const 		{ return unit_id; }
 	inline const player_t &		GetPlayer() const 	{ return player_id; }
 	inline const unitvis_c &	GetVisual() const 	{ return unit_vis; }
-    inline const dir_c &			GetDir() const      { return dir; }
+    inline const dir_c &		GetDir() const      { return dir; }
 	inline const uvector2&		GetPos() const 						{ return pos; }
 
 	// Set
-    inline player_t SetPlayer(const player_t &v)  	{ return (player_id = v); }
+    inline player_t	 			SetPlayer(const player_t &v)  	{ return (player_id = v); }
     inline unitvis_c 			SetVisual(const unitvis_c &v)  	{ return (unit_vis = v); }
-    inline dir_c SetDir(const dir_c &v)          { return (dir = v); }
+    inline dir_c 				SetDir(const dir_c &v)          { return (dir = v); }
 	inline void 				SetPos(const uvector2 &v)  		{ pos = v; }
 
     // Get the co-ordinate in front of the unit
@@ -57,29 +57,29 @@ public:
 	bool 						SetFromVisual(const unitvis_c &vis);
 
     // Orientation methods
-	dir_c TurnLeft();
-    dir_c TurnRight();
-    dir_c TurnAround();
+	dir_c 						TurnLeft();
+    dir_c 						TurnRight();
+    dir_c 						TurnAround();
 
 private:
 
     // Update my visual must be called when setting direction
-	unitvis_c UpdateMyVisual();
+	unitvis_c 				UpdateMyVisual();
 
 	// Unit ID
-    unit_id_t 					unit_id;
+    unit_id_t 				unit_id;
 
 	// Visual 
-	unitvis_c 					unit_vis;
+	unitvis_c 				unit_vis;
 
 	// Player ID
-	player_t player_id;
+	player_t 				player_id;
 
 	// Direction
-	dir_c dir;
+	dir_c 					dir;
 	
 	// Position
-	uvector2 					pos;
+	uvector2 				pos;
 };
 
 // Typedef for a vector of units