Clean up command line arg parsing