oprava refactoring