Fix indention, also do a little vertical alignment of changed lines.