more style fixes of generated code