Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Santos Gallegos <c93ded90b46be7383e4bbe2bf57d9211ae19c2eb@protonmail.com>
Co-authored-by: Manuel Kaufmann <54d769c38f2aa6d2679b577ce2986fc3d1abeaba@gmail.com>
rtfd/readthedocs.org,rtfd/readthedocs.org,rtfd/readthedocs.org,rtfd/readthedocs.org