Refactoring

Merged Piotr Gawron requested to merge refactor into master

Merge request reports