I cleaned up some code and comments in various files.