more clean up of command line argument parsing