Set verb refactor