Tweaks to variable names, spacing, stray foo, etc.