Tidy up a little after recent changes.
Merge pull request #22 from greboid/master

Tidy up after recent changes.