ZH2006Swiss pep8 fixes