address more issues from the PR