refactor cli #12