Readability counts.
Adjust variable semantics.
Fixed bogus comments.