TRUNK-4003 resolved the privious formatter issues and removed some un nuccessary code