Small restructuring and less repetitions

12 jobs for update_scoring in 18 minutes and 37 seconds (queued for 11 seconds)