Fix comments based on review feedback