Update comments to be more generic