Fixing some stylistic issues.

Partially addresses issue #9.