Made changes to the code based on the code review.