Yet more style updates