Refactor implementation

3 jobs for master in 10 minutes and 8 seconds (queued for 2 seconds)