Refactor _.enhance