refactored, updates/uses lexicon dict