some more style fixes