refactoring after changes in Solvers