Refactor after code review By Nandini