few cosmetic adjustments for generated code