fixing some formatting
Merge pull request #63 from scollier/formatting

Looks good. Merging.