Refactor def.