Refactor explicit references