Pylint fixes

Make pylint a bit happier with the codebase.