STYLE: Formatting fixes part 2.