Tidied up some messy looking code
Updated authors
Merge pull request #1 from markmcconachie/tidy-shit-up

Tidied up some messy looking code