Command method refactoring