Improve spacing and comments.