pep8'd and pylint'd the areas of code changes in py3k branch.