addressing issues from PR review