fixes, reformat