Fix formatting using headers