Formatter and configuration simplification.
Merge pull request #2 from enzet/master

Formatter and configuration simplification