Polishing: make use of case class copy method