Refactored CLI application.