addressed PR review comments