yet more style fixes