Lexicon code refactoring.