Spell check and got rid of string based logic