Beautify generated code for property handling