Ensure file handle is closed using with statement

This change ensures the file handle is always closed.