Minor cleanup

Some minor cleanup and typo fixes.