Tidied up Hotkey class