Updated as per repo owners comments. Tox still passing