Fixed minor issues from pull request review