Further Code Gen formatting changes (spacing)
More fixes to code gen formatting (spacing)