renamed city clustering mapper and reducer functions