PEP8 cleanup

PEP8 cleanup to make it pass pylint cleanly.