Re-write commandLineParser and rename a DataParser method.