Some pep8 and style fixes.