Code generator improvement