Some more style tweaks