CMS-2444: Spelling and code formatting.