Comments, renaming and style tweaks.