A few style tweaks