Improving 'map' example