Cleaning up solver class