Refactoring & Add words/idioms