Modernize code

2 jobs for master in 7 minutes and 46 seconds (queued for 40 minutes and 38 seconds)