Implement code-review fixes