Some minor tidying up.
Merge pull request #5 from huntc/small-tidyings

Some minor tidying up.