Fixed formatter code
Fixes / Cleanup