some formatting, etc
Merge pull request #1 from warpech/patch-1

some formatting, etc