further improvements
in the middle of refactoring
commit przed robieniem na studia