Fixed whitespace miss-alignments and converted all tabs to spaces