Making changes according to the code review for comments