More comments based on review feedback