pep8-ification of solver.py, no other changes