refactoring and delta term in wcgsolve