Command line arg cleanup