more formatting tweaks part 2