tidies spacing and indentation
Merge pull request #29 from rjz/fix-formatting

tidies spacing and indentation