Command Refactoring