cleaned up hashmap/stringmap API