style fixes during integration