Update for comments from PR