Address comments from PR