Refactor hash make stuff