Address further review feedback