clean up code generation a bit