Minor command refactoring