Address pull request comments: minor changes