Formatting fixes - part 2.