More stylistic tweaks, moving to more compact format (sorry!)