CLI Refactoring Completed