will refactor resolve