Incorporated PR comments