Refactor : reduce cognitive complexity

3 jobs for web-interface in 3 minutes and 26 seconds (queued for 3 seconds)