Clean up and added commandline arguments to minimize unnecessary items