Cleaning up unneeded parameters and making some minor formatting changes.