Simplify code

2 jobs for develop
in 1 minute and 20 seconds and was queued for 2 seconds