Try to follow pep8 more closely as required in bug #135