Pylint and minor clean up.