Better generated code