Some pep8 style fixes