cleanup reformat