Spelling and entity fix
Clean up