Minor tweaks can share with hash