Made a case class make more sense