More stylistic and comment changes

Hi,

I have some more changes for you.