Formatting improvements
Merge pull request #289 from dreamteam69/master

Formatting improvements