Refactoring and working on the command.