Refactored, adjusted format_cli() inheritance and cleanup