Points noted down after the code review.