Add comments to explain cloning, handling of 'retriever'