cosmetic
clean
simplify ShortcutEvents
cosmetic