diff --git a/src/CommandBase.h b/src/CommandBase.h
index cd628b9..a0e5d05 100644
--- a/src/CommandBase.h
+++ b/src/CommandBase.h
@@ -2,7 +2,6 @@
 #define COMMAND_BASE_H
 
 #include <string>
-//#include "Commands/Drive.h"
 #include "Subsystems/Drivetrain.h"
 #include "Subsystems/Collector.h"
 #include "Subsystems/Elevator.h"
@@ -10,13 +9,13 @@
 #include "WPILib.h"
 
 class CommandBase: public Command {
-public:
-	CommandBase(char const *name);
-	CommandBase();
-	static void init();
-	static Drivetrain *drivetrain;
-	static Collector *collector;
-	static Elevator *elevator;
-	static OI *oi;
+  public:
+    CommandBase(char const *name);
+    CommandBase();
+    static void init();
+    static Drivetrain *drivetrain;
+    static Collector *collector;
+    static Elevator *elevator;
+    static OI *oi;
 };
 #endif
diff --git a/src/Commands/Collect.cpp b/src/Commands/Collect.cpp
index d07eadb..2ed8766 100644
--- a/src/Commands/Collect.cpp
+++ b/src/Commands/Collect.cpp
@@ -6,7 +6,7 @@ void Collect::Initialize(){
 void Collect::Execute(){
 }
 bool Collect::IsFinished(){
-	return false;
+  return false;
 }
 void Collect::End(){
 
diff --git a/src/Commands/Collect.h b/src/Commands/Collect.h
index fd25c8b..9851adc 100644
--- a/src/Commands/Collect.h
+++ b/src/Commands/Collect.h
@@ -5,13 +5,13 @@
 #include "WPILib.h"
 
 class Collect: public CommandBase{
-public:
-	Collect();
-	void Initialize();
-	void Execute();
-	bool IsFinished();
-	void End();
-	void Interrupted();
+  public:
+    Collect();
+    void Initialize();
+    void Execute();
+    bool IsFinished();
+    void End();
+    void Interrupted();
 };
 
 #endif
diff --git a/src/Commands/Drive.cpp b/src/Commands/Drive.cpp
index 034c2b8..e901aa6 100644
--- a/src/Commands/Drive.cpp
+++ b/src/Commands/Drive.cpp
@@ -6,7 +6,7 @@ void Drive::Initialize(){
 void Drive::Execute(){
 }
 bool Drive::IsFinished(){
-	return false;
+  return false;
 }
 void Drive::End(){
 
diff --git a/src/Commands/Drive.h b/src/Commands/Drive.h
index e9da98a..7d8e070 100644
--- a/src/Commands/Drive.h
+++ b/src/Commands/Drive.h
@@ -5,13 +5,13 @@
 #include "WPILib.h"
 
 class Drive: public CommandBase{
-public:
-	Drive();
-	void Initialize();
-	void Execute();
-	bool IsFinished();
-	void End();
-	void Interrupted();
+  public:
+    Drive();
+    void Initialize();
+    void Execute();
+    bool IsFinished();
+    void End();
+    void Interrupted();
 };
 
 #endif
diff --git a/src/Commands/Eject.cpp b/src/Commands/Eject.cpp
index a5b7f59..4ac7f59 100644
--- a/src/Commands/Eject.cpp
+++ b/src/Commands/Eject.cpp
@@ -6,7 +6,7 @@ void Eject::Initialize(){
 void Eject::Execute(){
 }
 bool Eject::IsFinished(){
-	return false;
+  return false;
 }
 void Eject::End(){
 
diff --git a/src/Commands/Eject.h b/src/Commands/Eject.h
index 9bbb8c7..8124c8c 100644
--- a/src/Commands/Eject.h
+++ b/src/Commands/Eject.h
@@ -5,13 +5,13 @@
 #include "WPILib.h"
 
 class Eject: public CommandBase{
-public:
-	Eject();
-	void Initialize();
-	void Execute();
-	bool IsFinished();
-	void End();
-	void Interrupted();
+  public:
+    Eject();
+    void Initialize();
+    void Execute();
+    bool IsFinished();
+    void End();
+    void Interrupted();
 };
 
 #endif
diff --git a/src/Commands/Lower.cpp b/src/Commands/Lower.cpp
index 0ef564d..8422fb1 100644
--- a/src/Commands/Lower.cpp
+++ b/src/Commands/Lower.cpp
@@ -6,7 +6,7 @@ void Lower::Initialize(){
 void Lower::Execute(){
 }
 bool Lower::IsFinished(){
-	return false;
+  return false;
 }
 void Lower::End(){
 
diff --git a/src/Commands/Lower.h b/src/Commands/Lower.h
index 1d5718b..5a58de1 100644
--- a/src/Commands/Lower.h
+++ b/src/Commands/Lower.h
@@ -5,13 +5,13 @@
 #include "WPILib.h"
 
 class Lower: public CommandBase{
-public:
-	Lower();
-	void Initialize();
-	void Execute();
-	bool IsFinished();
-	void End();
-	void Interrupted();
+  public:
+    Lower();
+    void Initialize();
+    void Execute();
+    bool IsFinished();
+    void End();
+    void Interrupted();
 };
 
 #endif
diff --git a/src/Commands/Raise.cpp b/src/Commands/Raise.cpp
index 0cf0cec..9eb7559 100644
--- a/src/Commands/Raise.cpp
+++ b/src/Commands/Raise.cpp
@@ -6,7 +6,7 @@ void Raise::Initialize(){
 void Raise::Execute(){
 }
 bool Raise::IsFinished(){
-	return false;
+  return false;
 }
 void Raise::End(){
 
diff --git a/src/Commands/Raise.h b/src/Commands/Raise.h
index 1eac77e..579ad22 100644
--- a/src/Commands/Raise.h
+++ b/src/Commands/Raise.h
@@ -5,13 +5,13 @@
 #include "WPILib.h"
 
 class Raise: public CommandBase{
-public:
-	Raise();
-	void Initialize();
-	void Execute();
-	bool IsFinished();
-	void End();
-	void Interrupted();
+  public:
+    Raise();
+    void Initialize();
+    void Execute();
+    bool IsFinished();
+    void End();
+    void Interrupted();
 };
 
 #endif
diff --git a/src/OI.h b/src/OI.h
index 51aef6e..01b5823 100644
--- a/src/OI.h
+++ b/src/OI.h
@@ -5,8 +5,8 @@
 
 class OI
 {
-private:
-public:
-	OI();
+  private:
+  public:
+    OI();
 };
 #endif
diff --git a/src/Subsystems/Collector.h b/src/Subsystems/Collector.h
index 717d8ba..c9026ce 100644
--- a/src/Subsystems/Collector.h
+++ b/src/Subsystems/Collector.h
@@ -4,9 +4,9 @@
 #include "WPILib.h"
 class Collector: public Subsystem
 {
-private:
-public:
-	Collector();
-	void InitDefaultCommand();
+  private:
+  public:
+    Collector();
+    void InitDefaultCommand();
 };
 #endif
diff --git a/src/Subsystems/Drivetrain.h b/src/Subsystems/Drivetrain.h
index 26613d7..1e5e039 100644
--- a/src/Subsystems/Drivetrain.h
+++ b/src/Subsystems/Drivetrain.h
@@ -4,9 +4,9 @@
 #include "WPILib.h"
 class Drivetrain: public Subsystem
 {
-private:
-public:
-	Drivetrain();
-	void InitDefaultCommand();
+  private:
+  public:
+    Drivetrain();
+    void InitDefaultCommand();
 };
 #endif
diff --git a/src/Subsystems/Elevator.h b/src/Subsystems/Elevator.h
index 0c7f33a..7c379e2 100644
--- a/src/Subsystems/Elevator.h
+++ b/src/Subsystems/Elevator.h
@@ -4,9 +4,9 @@
 #include "WPILib.h"
 class Elevator: public Subsystem
 {
-private:
-public:
-	Elevator();
-	void InitDefaultCommand();
+  private:
+  public:
+    Elevator();
+    void InitDefaultCommand();
 };
 #endif