Merge branch 'refactoring' into 'master'

code refactoring

See merge request !4
1 job for master in 2 minutes and 40 seconds (queued for 2 seconds)