Cleaning up the comments and some of the formating.