code-review fixes