[4.2] Convert spaces to tabs and fix some alignments