A little of refactoring pt 2
Merge branch 'master' of https://github.com/LynxUA/Netcracker-Sunflower