Added Key Listener, did some overall cleaning