Renamed resolver to strategy, refactored strategy code
Incode documentation and parameter naming consistency