resolve - refactoring