Some clean up and tweaks
Merge pull request #32 from Callum-/master

Some clean up and tweaks