Pylint clean ups

Updated some of the code, to better reflect some pep-8 issues shown by
pylint in “lax” mode.