Removed unnecessary vals from case class defns