Code refactoring KRZYSZTOF part