Make all code generation more readable