Update for comments from Pull Request