Cleaned up command line arg parser