Final format tweak