More proper closing of files
7 files changed