Continue Refactoring CLI