Replaced some SkipListMaps to HashMaps

Other minor changes