removed temp variables from code generation