more style fixes