Address @minrk 's review comments.