Large functions refactoring

[romaintailhurat]

That's an overall task: identify the largest functions and split them into multiple smaller functions in order to enhance readability.

One example is the questionnaire merging function.