General tidying
more tidying
Merge pull request #2 from scraperdragon/tidy

Tidy