refactor shortcuts complete