Incorporated PR review comments