Improvements to format
Merge pull request #44 from ezfe/Satisfy-The-Traz

Improvements to format