Final minor style tweaks