Code clean-up in SolverWindow