pep8, s7util fixes due to client change.