Refactoring related to type of solvers - issue #94