Addressed more PR comments