diff --git a/src/main/java/dan200/computercraft/shared/network/container/ComputerContainerData.java b/src/main/java/dan200/computercraft/shared/network/container/ComputerContainerData.java
index 0863a8ab0..bf80c1726 100644
--- a/src/main/java/dan200/computercraft/shared/network/container/ComputerContainerData.java
+++ b/src/main/java/dan200/computercraft/shared/network/container/ComputerContainerData.java
@@ -3,43 +3,48 @@
  * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
+
 package dan200.computercraft.shared.network.container;
 
+import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.computer.core.ServerComputer;
+
 import net.minecraft.network.PacketByteBuf;
+import net.minecraft.util.Identifier;
 
-public class ComputerContainerData implements ContainerData
-{
-    private final int id;
-    private final ComputerFamily family;
+public class ComputerContainerData implements ContainerData {
+    private static final Identifier IDENTIFIER = new Identifier(ComputerCraft.MOD_ID, "computerContainerData");
+    private int id;
+    private ComputerFamily family;
 
-    public ComputerContainerData( ServerComputer computer )
-    {
+    public ComputerContainerData(ServerComputer computer) {
         this.id = computer.getInstanceID();
         this.family = computer.getFamily();
     }
 
-    public ComputerContainerData( PacketByteBuf buf )
-    {
-        this.id = buf.readInt();
-        this.family = buf.readEnumConstant( ComputerFamily.class );
+    @Override
+    public Identifier getId() {
+        return IDENTIFIER;
     }
 
     @Override
-    public void toBytes( PacketByteBuf buf )
-    {
-        buf.writeInt( id );
-        buf.writeEnumConstant( family );
+    public void fromBytes(PacketByteBuf buf) {
+        this.id = buf.readInt();
+        this.family = buf.readEnumConstant(ComputerFamily.class);
     }
 
-    public int getInstanceId()
-    {
+    @Override
+    public void toBytes(PacketByteBuf buf) {
+        buf.writeInt(id);
+        buf.writeEnumConstant(family);
+    }
+
+    public int getInstanceId() {
         return id;
     }
 
-    public ComputerFamily getFamily()
-    {
+    public ComputerFamily getFamily() {
         return family;
     }
 }
diff --git a/src/main/java/dan200/computercraft/shared/network/container/ViewComputerContainerData.java b/src/main/java/dan200/computercraft/shared/network/container/ViewComputerContainerData.java
index 35c54ae14..f30cdc8ae 100644
--- a/src/main/java/dan200/computercraft/shared/network/container/ViewComputerContainerData.java
+++ b/src/main/java/dan200/computercraft/shared/network/container/ViewComputerContainerData.java
@@ -3,60 +3,64 @@
  * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
+
 package dan200.computercraft.shared.network.container;
 
+import javax.annotation.Nonnull;
+
+import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.core.terminal.Terminal;
 import dan200.computercraft.shared.computer.core.ServerComputer;
-import javax.annotation.Nonnull;
+
 import net.minecraft.network.PacketByteBuf;
+import net.minecraft.util.Identifier;
 
 /**
  * View an arbitrary computer on the client.
  *
  * @see dan200.computercraft.shared.command.CommandComputerCraft
  */
-public class ViewComputerContainerData extends ComputerContainerData
-{
-    private final int width;
-    private final int height;
+public class ViewComputerContainerData extends ComputerContainerData {
+    private int width;
+    private int height;
 
-    public ViewComputerContainerData( ServerComputer computer )
-    {
-        super( computer );
+    public ViewComputerContainerData(ServerComputer computer) {
+        super(computer);
         Terminal terminal = computer.getTerminal();
-        if( terminal != null )
-        {
+        if (terminal != null) {
             width = terminal.getWidth();
             height = terminal.getHeight();
-        }
-        else
-        {
+        } else {
             width = height = 0;
         }
     }
 
-    public ViewComputerContainerData( PacketByteBuf buffer )
-    {
-        super( buffer );
-        width = buffer.readVarInt();
-        height = buffer.readVarInt();
+    private static final Identifier IDENTIFIER = new Identifier(ComputerCraft.MOD_ID, "viewComputerContainerData");
+
+    @Override
+    public Identifier getId() {
+        return IDENTIFIER;
     }
 
     @Override
-    public void toBytes( @Nonnull PacketByteBuf buf )
-    {
-        super.toBytes( buf );
-        buf.writeVarInt( width );
-        buf.writeVarInt( height );
+    public void fromBytes(PacketByteBuf buf) {
+        super.fromBytes(buf);
+        width = buf.readVarInt();
+        height = buf.readVarInt();
     }
 
-    public int getWidth()
-    {
+    @Override
+    public void toBytes(@Nonnull PacketByteBuf buf) {
+        super.toBytes(buf);
+        buf.writeVarInt(width);
+        buf.writeVarInt(height);
+    }
+
+    public int getWidth() {
         return width;
     }
 
-    public int getHeight()
-    {
+    public int getHeight() {
         return height;
     }
 }