Refactor and remove triggerShortcut()