Cleanup
Tweaked formatting and make configurable using formatting object
Code cleanup + docs