Comments, renaming, and a simpler data stream.