Refactored command.