Merge branch 'backend/refactor/long-method' into 'master'

Reduce complexity and simplify long methods

See merge request !37
2 jobs for master in 4 minutes and 8 seconds