Fix more whitespace formatting