diff --git a/PCK-Studio/Forms/Editor/AudioEditor.cs b/PCK-Studio/Forms/Editor/AudioEditor.cs
index 0e545d67..9ced2d7d 100644
--- a/PCK-Studio/Forms/Editor/AudioEditor.cs
+++ b/PCK-Studio/Forms/Editor/AudioEditor.cs
@@ -72,11 +72,7 @@ namespace PckStudio.Forms.Editor
             _isLittleEndian = isLittleEndian;
 
 			_audioAsset = asset;
-			using (var stream = new MemoryStream(asset.Data))
-			{
-				var reader = new PckAudioFileReader(isLittleEndian ? OMI.Endianness.LittleEndian : OMI.Endianness.BigEndian);
-                _audioFile = reader.FromStream(stream);
-			}
+            _audioFile = _audioAsset.GetData(new PckAudioFileReader(isLittleEndian ? OMI.Endianness.LittleEndian : OMI.Endianness.BigEndian));
 
 			SetUpTree();
 		}
diff --git a/PCK-Studio/Forms/Editor/COLEditor.cs b/PCK-Studio/Forms/Editor/COLEditor.cs
index cf2f9bda..c61fb1b9 100644
--- a/PCK-Studio/Forms/Editor/COLEditor.cs
+++ b/PCK-Studio/Forms/Editor/COLEditor.cs
@@ -33,12 +33,7 @@ namespace PckStudio.Forms.Editor
 			saveToolStripMenuItem1.Visible = !Settings.Default.AutoSaveChanges;
 
             _asset = asset;
-
-			using(var stream = new MemoryStream(asset.Data))
-			{
-				var reader = new COLFileReader();
-                colourfile = reader.FromStream(stream);
-			}
+			colourfile = asset.GetData(new COLFileReader());
 
 			TU12ToolStripMenuItem.Click += (sender, e) => SetUpDefaultFile(sender, e, 0);
 			TU13ToolStripMenuItem.Click += (sender, e) => SetUpDefaultFile(sender, e, 1);
diff --git a/PCK-Studio/Forms/Editor/LOCEditor.cs b/PCK-Studio/Forms/Editor/LOCEditor.cs
index ca829183..ebcc4ce8 100644
--- a/PCK-Studio/Forms/Editor/LOCEditor.cs
+++ b/PCK-Studio/Forms/Editor/LOCEditor.cs
@@ -24,11 +24,7 @@ namespace PckStudio.Forms.Editor
 		{
 			InitializeComponent();
 			_asset = asset;
-            using (var ms = new MemoryStream(asset.Data))
-            {
-				var reader = new LOCFileReader();
-                currentLoc = reader.FromStream(ms);
-            }
+			currentLoc = asset.GetData(new LOCFileReader());
 			saveToolStripMenuItem.Visible = !Settings.Default.AutoSaveChanges;
         }
 
diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs
index 9d5902d3..78bbfd41 100644
--- a/PCK-Studio/MainForm.cs
+++ b/PCK-Studio/MainForm.cs
@@ -1752,11 +1752,7 @@ namespace PckStudio
 
 			try
 			{
-				using (var stream = new MemoryStream(locAsset.Data))
-				{
-					var reader = new LOCFileReader();
-					locFile = reader.FromStream(stream);
-				}
+                locFile = locAsset.GetData(new LOCFileReader());
 				return true;
 			}
 			catch (Exception ex)