Codegen indent fixes
Codegen empty lines fix
Codegen style fix