refactor_cli
