reformat more code