Refactored evade