Updated the files based on code review