Cleanup
Use which instead of keycode