Refix formatting