Rest of whitespace fixes

because you were impatient