Wordsmithing and refactoring