Address review comments: Minor tweaks.