Code review following pull request comments