Pylint and cleanup