Indenting and newline tweak