refactored to remove verb hash