Cleaned up some of the comments and output strings.