Replaced more ArrayLists with HashMaps