Minor style fixes, typo fixes