another big trailing spaces cleanup