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

Short down length of methods

See merge request !32
3 jobs for master in 3 minutes and 18 seconds (queued for 6 seconds)