moar format fixing