Our solution - refactoring