Refactor
Refactor
Change: Resolve definables simplified