More pep8 fixes as required in #135