BS-7371: simplify formatter