command refactoring