Fixing issues pointed by pylint