refactoring shortcuts and actions