No functional changes. Lots of comments. Lots of cleanup.