diff --git a/src/system/debug.cpp b/src/system/debug.cpp
index 20bc9c9a9..a79e4986a 100644
--- a/src/system/debug.cpp
+++ b/src/system/debug.cpp
@@ -26,7 +26,7 @@
 
 int debug = DEBUG_NORMAL;
 
-void setDebugLevel( int level )
+void setDebugLevel(int level)
 {
 	debug = level;
 }
diff --git a/src/system/debug.h b/src/system/debug.h
index ba26705b7..355014dc6 100644
--- a/src/system/debug.h
+++ b/src/system/debug.h
@@ -25,6 +25,7 @@
 #ifndef __neutrino_debug__
 #define __neutrino_debug__
 #include <zapit/debug.h>
+
 extern int debug;
 
 enum
@@ -37,19 +38,8 @@ enum
 };
 
 
-void setDebugLevel( int level );
+void setDebugLevel(int level);
 
-#if 0
-#define dprintf(debuglevel, fmt, args...) \
-	do
-	{ \
-		if (debug >= debuglevel) \
-			printf( "[neutrino] " fmt, ## args); \
-	}
-	while(0)
-#define dperror(str) {perror("[neutrino] " str);}
-#else
-// more thread save implementation
 #define dprintf(debuglevel, fmt, args...) \
 	do { \
 		if (debug >= debuglevel) \
@@ -62,6 +52,5 @@ void setDebugLevel( int level );
 		strerror_r(errno, errbuf, sizeof(errbuf)); \
 		fprintf(stderr, "[neutrino] %s: %s\n", str, errbuf); \
 	} while(0)
-#endif
 
-#endif
+#endif // __neutrino_debug__