diff --git a/src/Surfaces/SurfaceManager.cpp b/src/Surfaces/SurfaceManager.cpp
index 929fd1f..493a949 100644
--- a/src/Surfaces/SurfaceManager.cpp
+++ b/src/Surfaces/SurfaceManager.cpp
@@ -2,10 +2,9 @@
 
 namespace ofx {
 namespace piMapper {
-  SurfaceManager::SurfaceManager() {
-    // Init variables
-    mediaServer = NULL;
-  }
+  SurfaceManager::SurfaceManager() :
+  mediaServer(NULL),
+  selectedSurface(NULL) {}
 
 SurfaceManager::~SurfaceManager() { clear(); }