More formatting improvements
Merge pull request #288 from dreamteam69/master

More formatting improvements