Cleaned up KeyHandler a bit