Fix some trailing whitespace
Fix some typos in "contain"