STY: More Pylint and cleanup