code refactoring

Merged Jerome Touvier requested to merge refactoring into master

Merge request reports