Housekeeping

Tweaked some comments, whitespace, naming etc.