Fix argument handling for CLI wizard
Style fixes in cli.py