Tweaked minor things for clarity: whitespace, comments, redundant type.