Reworked formatter.