Formatting improvements.
Merge pull request #9 from eveoh/fb-master_formatting

Formatting improvements