more style fixes2