refactoring derp (List/TreeMap)