review for fix memory leak