fix review concerns