Refactoring

Vladyslav Koval requested to merge refactoring into master

Changed variable names to more conventional

Merge request reports