Addressed code-review comments.