Consistent indentation and syntax
Merge pull request #6 from jsoxford/some-other-fixes

Consistent indentation and syntax