Changing file name and removing unused local variable