More pep8 style fixes