Pep8 cleanup

Just PEP8 changes, and  fixing typos.