better looking generated code