general refactoring

3 jobs for master in 12 minutes and 6 seconds (queued for 1 second)