Ensure file handle is closed using with statement

This change ensures the file handles are closed by using the with statement.