Hey: more style fixes, no functionnal changes intended