Minor refactoring in Command.java