partial pep8 cleanup
Some changes for pylint