Tidy requirements spec
Simplified overlay tap finder loop