Some more phrases refactoring, thanks @swissmanu