Cleaned code style right up.
Merge pull request #76 from chrispitt/code-style-cleanup

Cleaned code style right up.