address comments in PR