Refactoring EcuationResolver. Applying multiple assignment