Refactor comment
Add system keyboard shortcut