refactoring resolve section