Added review fix comments