Further style tweaks