Fix more whitespace in files