Move detection routines to helper function
Move detection routines to helper function

This change should make it easier to OR together detection methods

atkvo/masters-bot,atkvo/masters-bot,atkvo/masters-bot,atkvo/masters-bot,atkvo/masters-bot