Refactor - CLI Separation of Concerns