added formatting
fixed some formatting
Merge pull request #36 from lauyeung/more-formatting

More formatting