Removed unnecessary use of iterator; Renamed mapping class.