diff --git a/record.py b/record.py
index 8f4f054..227b182 100644
--- a/record.py
+++ b/record.py
@@ -28,12 +28,9 @@ class Record:
 
 class RecordCollection():
     def __init__(self, file):
-        fd = filewrapper(file, "r")
-
-        self._fromFile(fd)
-        self._parent()
-
-        fd.close()
+        with filewrapper(file, "r") as fd:
+            self._fromFile(fd)
+            self._parent()
 
     def _fromFile(self, fd):
         lines = [i.rstrip() for i in fd.readlines()]
@@ -85,26 +82,25 @@ class RecordCollection():
         return ret
 
     def write(self, file):
-        fd = filewrapper(file, "w")
+        with filewrapper(file, "w") as fd:
 
-        lines = []
-        for i in self.objects:
-            if self.objects[i].children:
-                lines.append(f"cat {self.objects[i].name}:")
-            else:
-                lines.append(f"rec {self.objects[i].name}:")
+            lines = []
+            for i in self.objects:
+                if self.objects[i].children:
+                    lines.append(f"cat {self.objects[i].name}:")
+                else:
+                    lines.append(f"rec {self.objects[i].name}:")
 
-            for j in self.objects[i].data:
-                lines.append(
-                    f"  {j}: {self.objects[i].data[j]}"
-                )
+                for j in self.objects[i].data:
+                    lines.append(
+                        f"  {j}: {self.objects[i].data[j]}"
+                    )
 
-            lines.append("")
+                lines.append("")
 
-        lines.pop()
+            lines.pop()
 
-        for i in range(len(lines)):
-            lines[i] += "\n"
+            for i in range(len(lines)):
+                lines[i] += "\n"
 
-        fd.writelines(lines)
-        fd.close()
+            fd.writelines(lines)