I'm happy to do that in a later PR btw