Spelling correction and removing unnecessary test