Tidied up the codebase a little and a little server script
Merge pull request #46 from felamaslen/bugfix/tidy_up

Tidied up the codebase a little and a little server script