diff --git a/src/Utils/TerminalListener.cpp b/src/Utils/TerminalListener.cpp
index 1c00a98..2ecd9b0 100644
--- a/src/Utils/TerminalListener.cpp
+++ b/src/Utils/TerminalListener.cpp
@@ -17,7 +17,7 @@ TerminalListener::~TerminalListener(){
 	close();
 }
 
-void TerminalListener::setup(KeyListener * listener_, int sleepTime_ = 0){
+void TerminalListener::setup(KeyListener * listener_, int sleepTime_){
 	listener = listener_;
 
 	if(sleepTime_ > 0){
@@ -39,7 +39,7 @@ void TerminalListener::setup(KeyListener * listener_, int sleepTime_ = 0){
 
 void TerminalListener::run(){
 	while (thread.isRunning()){
-		if (listener != NULL){
+		if (listener != 0){
 			int ch[8];
 			int chnum = 0;
 
@@ -67,7 +67,7 @@ void TerminalListener::run(){
 void TerminalListener::close(){
 	tcsetattr(STDIN_FILENO, TCSANOW, &orig_termios);
 	thread.tryJoin(50);
-	listener = NULL;
+	listener = 0;
 }
 
 } // namespace piMapper
diff --git a/src/Utils/TerminalListener.h b/src/Utils/TerminalListener.h
index a79a372..26c080b 100644
--- a/src/Utils/TerminalListener.h
+++ b/src/Utils/TerminalListener.h
@@ -34,11 +34,11 @@ class TerminalListener : public Poco::Runnable {
 		TerminalListener();
 		~TerminalListener();
 	
-		void setup(KeyListener* listener_, int sleepTime_);
+		void setup(KeyListener * listener_, int sleepTime_ = 0);
 		void run();
 		void close();
 	
-		KeyListener* listener;
+		KeyListener * listener;
 		Poco::Thread thread;
 		int sleepTime;
 };