Merge "Fix indenting and newlines"