Cleaned Solver