Further pep8tification changes