code cleanup, added hotkeys