Refactoring of shortcuts