Refactor qualified def