improvements in the code generation