refactor the interface a bit

5 jobs for master in 48 minutes and 50 seconds (queued for 7 seconds)