formatting fixes part 2