small refactoring

3 jobs for sync-speed in 5 minutes and 20 seconds (queued for 7 seconds)