tidied and reformatted code
Merge pull request #18 from neocotic/code-tidy

Code tidy