Finished pep8 pass.