Minor fixes to variable names, comments, etc.