Some general style cleanup.

This closes issue #7.