Cleaning up some of the formatting issues.