Modified file according to the code review