Hashtable -> HashMap improve runtime