Cleaning up some naming conventions and default command line arguments.