Simplification of the code generator