CF2008Swiss -pep8 fixes