[UPDATE] more style fixes