Some more minor style tweaks