shortcut key code cleanup