More commenting, and variable renaming