Tidying up cmdline.py