Minor cleanup of hashmap