Small formatting tweaks, reshuffle.