Comments / whitespace cleanup
Some wording changes