Better configuration, may use more than one shortcut for a command
Small cleaning