updated comments and removed MapUtil