Improving map and filter examples