pep8 and a fix for #18