Tidied up code
Merge pull request #2 from danielgittings/code_tidy

Tidied up code