Refactor check*Proximity