Renamed formatter classes.
Removed unncessary code line.