Improvement of the code generation