Implement suggested changes to HashDB pull request