Refactoring and rewording