Minor tweaks, formatting.