Cleanup in some formatting related classes

Change-Id: I7eda1eb2d67fe2e272b40e631b686cb4293c2857
Merge "Cleanup in some formatting related classes"