fix the code review feedback