Cli help refactored