Refactoring ii

Merged Loic Huder requested to merge refactoring_II into master

Merge request reports