intermediate commit - generated code now has much better formatting (indentations)