Begin refactoring commands