Disconnect unrelated conditions
Indent for clarity
Extract condition, method, and smart-assery :)
Remove unused method