Simplify/tweak styles