Refactored map functionality into map class.