Improvement code review comments