Some minor style tweaks