Simplifying mapping
Modification of case class Gallery + tests