Changes to address 'pylint' flagged issues