code review final changes