Minor code changes from pull request review