Spelling corrections and general cleanup