- removed separation comments in CLI
- renamed instances of "cli_options" and "cli_config" to just "options"