pep8 and cleanups, r=twobraids