refactoring command