Fix whitespace and adjust comments.