WIP: Refactoring

Vadym Tishchenko requested to merge vadym/refactoring into master

Merge request reports