Some code changes to "satisfy" pylint ;-)