Minor cleanups to comments and other junk