More readable hash map build

#fixes 5