Minor tweaks to code formatting and comments.
Update to 2.1.