Some polish
Merge pull request #6 from ashleyprice/polish

Some polish