Minor cleaning of refactoring
SOLID fixes
Merge pull request #28 from UNN-VMK-Software/minor-fixes-after-merges

Minor cleaning after merges