Did different changes to make pylint happy