Fix typos and some trailing spaces