Fix more whitespaces