remove the useless Solver class, fixed comments