Applied all of David Booth and Peter Patel-Schneider's feedback.

Related to #222.