Minor cleanup.
Fixed hashmap weird measurement issue.