refactor shortcuts