Minor clean up, use a case class instead of a Tuple