cleanup reformat 2