Cleaned up evasion code