code cleanup, added hotkeys
code cleanup, added hotkeys