Improve Command.java