reformat and header improvements