diff --git a/wpilibc/wpilibC++/include/LiveWindow/LiveWindow.h b/wpilibc/wpilibC++/include/LiveWindow/LiveWindow.h
index 93f9cca4cd..ab78d3c452 100644
--- a/wpilibc/wpilibC++/include/LiveWindow/LiveWindow.h
+++ b/wpilibc/wpilibC++/include/LiveWindow/LiveWindow.h
@@ -14,7 +14,7 @@ struct LiveWindowComponent
 	bool isSensor;
 
 	LiveWindowComponent()
-	{}//WTF?
+	{}
 	LiveWindowComponent(std::string subsystem, std::string name, bool isSensor)
 	{
 		this->subsystem = subsystem;
@@ -54,7 +54,6 @@ private:
 	std::vector<LiveWindowSendable *> m_sensors;
 	std::map<LiveWindowSendable *, LiveWindowComponent> m_components;
 
-	static LiveWindow *m_instance;
 	ITable *m_liveWindowTable;
 	ITable *m_statusTable;
 
diff --git a/wpilibc/wpilibC++/lib/LiveWindow/LiveWindow.cpp b/wpilibc/wpilibC++/lib/LiveWindow/LiveWindow.cpp
index 6d28f0d79a..fa0206d62d 100644
--- a/wpilibc/wpilibC++/lib/LiveWindow/LiveWindow.cpp
+++ b/wpilibc/wpilibC++/lib/LiveWindow/LiveWindow.cpp
@@ -3,8 +3,6 @@
 #include <algorithm>
 #include <sstream>
 
-LiveWindow* LiveWindow::m_instance = NULL;
-
 /**
  * Get an instance of the LiveWindow main class
  * This is a singleton to guarantee that there is only a single instance regardless of
@@ -12,11 +10,9 @@ LiveWindow* LiveWindow::m_instance = NULL;
  */
 LiveWindow * LiveWindow::GetInstance()
 {
-	if (m_instance == NULL)
-	{
-		m_instance = new LiveWindow();
-	}
-	return m_instance;
+	static LiveWindow* instance = new LiveWindow();
+
+	return instance;
 }
 
 /**