Added option to beautify generated code