PR review comments addressed