code refactoring

Jerome Touvierrequested to merge
refactoring into master

Merge request reports