Refactor map in surrounding_locations to one-liner