style fixes 2.0