Remove duplication in CLI from Config