Address code-review comments