reformat, refactor