Better comments in Solver