Minor tweaking

A few tweaks to make things clearer and remove some of the unnecessary
commented lines.