remove complexity in mapping series class