Further formatting fixes
Merge pull request #48 from kmarsteller/master

Further formatting fixes