rm hash, added less specialization
changed container to map
format