[fixup]: Updates based on review