Temporary result of refactoring