More pylint inspired cleanup.