Improved generated code readability