diff --git a/tsak/main.cpp b/tsak/main.cpp
index d7ba23b..0cbfa37 100644
--- a/tsak/main.cpp
+++ b/tsak/main.cpp
@@ -49,7 +49,7 @@ int         mPipe_fd_out;
 struct sigaction usr_action;
 sigset_t block_mask;
 
-char *keycode[256] =
+const char *keycode[256] =
 {
 	"", "<esc>", "1", "2", "3", "4", "5", "6", "7", "8",
 	"9", "0", "−", "=", "<backspace>", "<tab>", "q", "w", "e", "r",
@@ -144,7 +144,6 @@ void tearDownPipe()
 
 void setupPipe()
 {
-
 	/* Create the FIFOs if they do not exist */
 	umask(0);
 	mkdir(FIFO_DIR,0644);
@@ -158,11 +157,21 @@ void setupPipe()
 	}
 }
 
-void handle_sigterm (int sig)
+class PipeHandler
+{
+public:
+	PipeHandler();
+	~PipeHandler();
+};
+
+PipeHandler::PipeHandler()
+{
+	setupPipe();
+}
+
+PipeHandler::~PipeHandler()
 {
 	tearDownPipe();
-	exit(0);
-	return;
 }
 
 int main (int argc, char *argv[])
@@ -176,15 +185,9 @@ int main (int argc, char *argv[])
 	bool alt_down = false;
 	bool hide_event = false;
 
-	// Initialize signal handlers
-	sigfillset(&block_mask);
-	usr_action.sa_handler = handle_sigterm;
-	usr_action.sa_mask = block_mask;
-	usr_action.sa_flags = 0;
-        sigaction(SIGTERM, &usr_action, NULL);
+	// Create the output pipe
+	PipeHandler controlpipe;
 
-	atexit(tearDownPipe);
-	
 	if ((getuid ()) != 0) {
 		printf ("You are not root! This WILL NOT WORK!\nDO NOT attempt to bypass security restrictions, e.g. by changing keyboard permissions or owner, if you want the SAK system to remain secure...\n");
 		return 5;
@@ -230,9 +233,6 @@ int main (int argc, char *argv[])
 		fprintf(stderr, "Failed to grab exclusive input device lock");
 		return 1;
 	}
-
-	// Create the output pipe
-	setupPipe();
 	
 	while (1) {
 
@@ -276,7 +276,5 @@ int main (int argc, char *argv[])
 		}
 	}
 
-	tearDownPipe();
-
 	return 0;
 }