started improving code formatting and style
more code tidying
Merge pull request #14 from neocotic/improve-code

Improve code formatting and style