More whitespace and spaces to tabs