refactor and matcher

3 jobs for master in 1 minute and 30 seconds (queued for 2 seconds)