Change format to improve readability
Fix
Update generated code