Some more minor tweaks, formatting etc.