Fix the issues reported in code review.