Removed some redundant object references to use the DTO already created (CommandInterpreter)