Code review PR

Instead of returning a tuple, I'd create a case class so the arguments are named.