refactor/CLI