few more style fixes