Rework formatting