Fix typos

Just a few minor typo and style fixes.