Refactoring

Merged Pavel Sklenář requested to merge refactor into milestone-3

Merge request reports