Align hash updates

This PR is in response to @yujinakayama's comments in #471.