diff --git a/src/main/java/dan200/computercraft/api/client/TransformedModel.java b/src/main/java/dan200/computercraft/api/client/TransformedModel.java
index a130d27a8..90de27355 100644
--- a/src/main/java/dan200/computercraft/api/client/TransformedModel.java
+++ b/src/main/java/dan200/computercraft/api/client/TransformedModel.java
@@ -32,7 +32,7 @@ public TransformedModel( @Nonnull IBakedModel model, @Nonnull TransformationMatr
     public TransformedModel( @Nonnull IBakedModel model )
     {
         this.model = Objects.requireNonNull( model );
-        this.matrix = TransformationMatrix.identity();
+        matrix = TransformationMatrix.identity();
     }
 
     public static TransformedModel of( @Nonnull ModelResourceLocation location )
diff --git a/src/main/java/dan200/computercraft/api/filesystem/FileOperationException.java b/src/main/java/dan200/computercraft/api/filesystem/FileOperationException.java
index be6519fbd..638c61486 100644
--- a/src/main/java/dan200/computercraft/api/filesystem/FileOperationException.java
+++ b/src/main/java/dan200/computercraft/api/filesystem/FileOperationException.java
@@ -30,7 +30,7 @@ public FileOperationException( @Nullable String filename, @Nonnull String messag
     public FileOperationException( @Nonnull String message )
     {
         super( Objects.requireNonNull( message, "message cannot be null" ) );
-        this.filename = null;
+        filename = null;
     }
 
     @Nullable
diff --git a/src/main/java/dan200/computercraft/api/lua/LuaException.java b/src/main/java/dan200/computercraft/api/lua/LuaException.java
index 9f98ddc09..e2738ea91 100644
--- a/src/main/java/dan200/computercraft/api/lua/LuaException.java
+++ b/src/main/java/dan200/computercraft/api/lua/LuaException.java
@@ -19,14 +19,14 @@ public class LuaException extends Exception
     public LuaException( @Nullable String message )
     {
         super( message );
-        this.hasLevel = false;
-        this.level = 1;
+        hasLevel = false;
+        level = 1;
     }
 
     public LuaException( @Nullable String message, int level )
     {
         super( message );
-        this.hasLevel = true;
+        hasLevel = true;
         this.level = level;
     }
 
diff --git a/src/main/java/dan200/computercraft/api/lua/MethodResult.java b/src/main/java/dan200/computercraft/api/lua/MethodResult.java
index 25a8a392d..7d15d60b7 100644
--- a/src/main/java/dan200/computercraft/api/lua/MethodResult.java
+++ b/src/main/java/dan200/computercraft/api/lua/MethodResult.java
@@ -30,14 +30,14 @@ public final class MethodResult
 
     private MethodResult( Object[] arguments, ILuaCallback callback )
     {
-        this.result = arguments;
+        result = arguments;
         this.callback = callback;
-        this.adjust = 0;
+        adjust = 0;
     }
 
     private MethodResult( Object[] arguments, ILuaCallback callback, int adjust )
     {
-        this.result = arguments;
+        result = arguments;
         this.callback = callback;
         this.adjust = adjust;
     }
diff --git a/src/main/java/dan200/computercraft/client/gui/widgets/DynamicImageButton.java b/src/main/java/dan200/computercraft/client/gui/widgets/DynamicImageButton.java
index af21d9e93..43368536d 100644
--- a/src/main/java/dan200/computercraft/client/gui/widgets/DynamicImageButton.java
+++ b/src/main/java/dan200/computercraft/client/gui/widgets/DynamicImageButton.java
@@ -62,6 +62,7 @@ public DynamicImageButton(
         this.tooltip = tooltip;
     }
 
+    @Override
     public void renderButton( int mouseX, int mouseY, float partialTicks )
     {
         Minecraft minecraft = Minecraft.getInstance();
diff --git a/src/main/java/dan200/computercraft/client/gui/widgets/WidgetTerminal.java b/src/main/java/dan200/computercraft/client/gui/widgets/WidgetTerminal.java
index 107a3c28d..dde9ea0ba 100644
--- a/src/main/java/dan200/computercraft/client/gui/widgets/WidgetTerminal.java
+++ b/src/main/java/dan200/computercraft/client/gui/widgets/WidgetTerminal.java
@@ -305,6 +305,7 @@ public void onFocusedChanged( boolean focused )
         }
     }
 
+    @Override
     public void render( int mouseX, int mouseY, float partialTicks )
     {
         // Draw the screen contents
diff --git a/src/main/java/dan200/computercraft/core/asm/Generator.java b/src/main/java/dan200/computercraft/core/asm/Generator.java
index c630b140f..051da8195 100644
--- a/src/main/java/dan200/computercraft/core/asm/Generator.java
+++ b/src/main/java/dan200/computercraft/core/asm/Generator.java
@@ -63,7 +63,7 @@ public final class Generator<T>
     {
         this.base = base;
         this.context = context;
-        this.interfaces = new String[] { Type.getInternalName( base ) };
+        interfaces = new String[] { Type.getInternalName( base ) };
         this.wrap = wrap;
 
         StringBuilder methodDesc = new StringBuilder().append( "(Ljava/lang/Object;" );
diff --git a/src/main/java/dan200/computercraft/core/lua/CobaltLuaMachine.java b/src/main/java/dan200/computercraft/core/lua/CobaltLuaMachine.java
index 54a7efdc6..07cb1e923 100644
--- a/src/main/java/dan200/computercraft/core/lua/CobaltLuaMachine.java
+++ b/src/main/java/dan200/computercraft/core/lua/CobaltLuaMachine.java
@@ -64,7 +64,7 @@ public CobaltLuaMachine( Computer computer, TimeoutState timeout )
     {
         this.computer = computer;
         this.timeout = timeout;
-        this.context = new LuaContext( computer );
+        context = new LuaContext( computer );
         debug = new TimeoutDebugHandler();
 
         // Create an environment to run in
diff --git a/src/main/java/dan200/computercraft/core/terminal/Terminal.java b/src/main/java/dan200/computercraft/core/terminal/Terminal.java
index 61ddb65fd..f6e647bb3 100644
--- a/src/main/java/dan200/computercraft/core/terminal/Terminal.java
+++ b/src/main/java/dan200/computercraft/core/terminal/Terminal.java
@@ -44,9 +44,9 @@ public Terminal( int width, int height, Runnable changedCallback )
         this.height = height;
         onChanged = changedCallback;
 
-        text = new TextBuffer[this.height];
-        textColour = new TextBuffer[this.height];
-        backgroundColour = new TextBuffer[this.height];
+        text = new TextBuffer[height];
+        textColour = new TextBuffer[height];
+        backgroundColour = new TextBuffer[height];
         for( int i = 0; i < this.height; i++ )
         {
             text[i] = new TextBuffer( ' ', this.width );
@@ -93,9 +93,9 @@ public synchronized void resize( int width, int height )
         this.width = width;
         this.height = height;
 
-        text = new TextBuffer[this.height];
-        textColour = new TextBuffer[this.height];
-        backgroundColour = new TextBuffer[this.height];
+        text = new TextBuffer[height];
+        textColour = new TextBuffer[height];
+        backgroundColour = new TextBuffer[height];
         for( int i = 0; i < this.height; i++ )
         {
             if( i >= oldHeight )
diff --git a/src/main/java/dan200/computercraft/core/terminal/TextBuffer.java b/src/main/java/dan200/computercraft/core/terminal/TextBuffer.java
index d042a2b34..6266b072a 100644
--- a/src/main/java/dan200/computercraft/core/terminal/TextBuffer.java
+++ b/src/main/java/dan200/computercraft/core/terminal/TextBuffer.java
@@ -12,7 +12,7 @@ public class TextBuffer
     public TextBuffer( char c, int length )
     {
         text = new char[length];
-        this.fill( c );
+        fill( c );
     }
 
     public TextBuffer( String text )
@@ -79,6 +79,7 @@ public void setChar( int i, char c )
         }
     }
 
+    @Override
     public String toString()
     {
         return new String( text );
diff --git a/src/main/java/dan200/computercraft/shared/TurtleUpgrades.java b/src/main/java/dan200/computercraft/shared/TurtleUpgrades.java
index 6f5b3b3c2..fb12d4cc4 100644
--- a/src/main/java/dan200/computercraft/shared/TurtleUpgrades.java
+++ b/src/main/java/dan200/computercraft/shared/TurtleUpgrades.java
@@ -33,9 +33,9 @@ private static class Wrapper
         Wrapper( ITurtleUpgrade upgrade )
         {
             this.upgrade = upgrade;
-            this.id = upgrade.getUpgradeID().toString();
-            this.modId = ModLoadingContext.get().getActiveNamespace();
-            this.enabled = true;
+            id = upgrade.getUpgradeID().toString();
+            modId = ModLoadingContext.get().getActiveNamespace();
+            enabled = true;
         }
     }
 
diff --git a/src/main/java/dan200/computercraft/shared/common/ContainerHeldItem.java b/src/main/java/dan200/computercraft/shared/common/ContainerHeldItem.java
index 6a7830b1a..2665259ec 100644
--- a/src/main/java/dan200/computercraft/shared/common/ContainerHeldItem.java
+++ b/src/main/java/dan200/computercraft/shared/common/ContainerHeldItem.java
@@ -61,7 +61,7 @@ public static class Factory implements INamedContainerProvider
         public Factory( ContainerType<ContainerHeldItem> type, ItemStack stack, Hand hand )
         {
             this.type = type;
-            this.name = stack.getHoverName();
+            name = stack.getHoverName();
             this.hand = hand;
         }
 
diff --git a/src/main/java/dan200/computercraft/shared/computer/inventory/ContainerViewComputer.java b/src/main/java/dan200/computercraft/shared/computer/inventory/ContainerViewComputer.java
index 59a406576..733049a6e 100644
--- a/src/main/java/dan200/computercraft/shared/computer/inventory/ContainerViewComputer.java
+++ b/src/main/java/dan200/computercraft/shared/computer/inventory/ContainerViewComputer.java
@@ -25,14 +25,14 @@ public class ContainerViewComputer extends ContainerComputerBase implements ICon
     public ContainerViewComputer( int id, ServerComputer computer )
     {
         super( Registry.ModContainers.VIEW_COMPUTER.get(), id, player -> canInteractWith( computer, player ), computer, computer.getFamily() );
-        this.width = this.height = 0;
+        width = height = 0;
     }
 
     public ContainerViewComputer( int id, PlayerInventory player, ViewComputerContainerData data )
     {
         super( Registry.ModContainers.VIEW_COMPUTER.get(), id, player, data );
-        this.width = data.getWidth();
-        this.height = data.getHeight();
+        width = data.getWidth();
+        height = data.getHeight();
     }
 
     private static boolean canInteractWith( @Nonnull ServerComputer computer, @Nonnull PlayerEntity player )
diff --git a/src/main/java/dan200/computercraft/shared/integration/crafttweaker/actions/AddTurtleTool.java b/src/main/java/dan200/computercraft/shared/integration/crafttweaker/actions/AddTurtleTool.java
index 38acb1561..9a8e70c4d 100644
--- a/src/main/java/dan200/computercraft/shared/integration/crafttweaker/actions/AddTurtleTool.java
+++ b/src/main/java/dan200/computercraft/shared/integration/crafttweaker/actions/AddTurtleTool.java
@@ -99,6 +99,7 @@ public String describeUndo()
         return String.format( "Removing turtle upgrade %s.", id );
     }
 
+    @Override
     public boolean validate( ILogger logger )
     {
         TrackingLogger trackLog = new TrackingLogger( logger );
diff --git a/src/main/java/dan200/computercraft/shared/integration/crafttweaker/actions/RemoveTurtleUpgradeByItem.java b/src/main/java/dan200/computercraft/shared/integration/crafttweaker/actions/RemoveTurtleUpgradeByItem.java
index dc1223118..0be3ca5c0 100644
--- a/src/main/java/dan200/computercraft/shared/integration/crafttweaker/actions/RemoveTurtleUpgradeByItem.java
+++ b/src/main/java/dan200/computercraft/shared/integration/crafttweaker/actions/RemoveTurtleUpgradeByItem.java
@@ -41,7 +41,7 @@ public String describe()
     @Override
     public void undo()
     {
-        if( this.upgrade != null ) TurtleUpgrades.enable( upgrade );
+        if( upgrade != null ) TurtleUpgrades.enable( upgrade );
     }
 
     @Override
diff --git a/src/main/java/dan200/computercraft/shared/integration/crafttweaker/actions/RemoveTurtleUpgradeByName.java b/src/main/java/dan200/computercraft/shared/integration/crafttweaker/actions/RemoveTurtleUpgradeByName.java
index 6ea355803..f888a557f 100644
--- a/src/main/java/dan200/computercraft/shared/integration/crafttweaker/actions/RemoveTurtleUpgradeByName.java
+++ b/src/main/java/dan200/computercraft/shared/integration/crafttweaker/actions/RemoveTurtleUpgradeByName.java
@@ -40,7 +40,7 @@ public String describe()
     @Override
     public void undo()
     {
-        if( this.upgrade != null ) TurtleUpgrades.enable( upgrade );
+        if( upgrade != null ) TurtleUpgrades.enable( upgrade );
     }
 
     @Override
diff --git a/src/main/java/dan200/computercraft/shared/integration/jei/RecipeResolver.java b/src/main/java/dan200/computercraft/shared/integration/jei/RecipeResolver.java
index 2050a83e7..d2b11fa34 100644
--- a/src/main/java/dan200/computercraft/shared/integration/jei/RecipeResolver.java
+++ b/src/main/java/dan200/computercraft/shared/integration/jei/RecipeResolver.java
@@ -339,17 +339,17 @@ private static class UpgradeInfo
         UpgradeInfo( ItemStack stack, ITurtleUpgrade turtle )
         {
             this.stack = stack;
-            this.ingredient = of( stack );
-            this.upgrade = this.turtle = turtle;
-            this.pocket = null;
+            ingredient = of( stack );
+            upgrade = this.turtle = turtle;
+            pocket = null;
         }
 
         UpgradeInfo( ItemStack stack, IPocketUpgrade pocket )
         {
             this.stack = stack;
-            this.ingredient = of( stack );
-            this.turtle = null;
-            this.upgrade = this.pocket = pocket;
+            ingredient = of( stack );
+            turtle = null;
+            upgrade = this.pocket = pocket;
         }
 
         List<Shaped> getRecipes()
diff --git a/src/main/java/dan200/computercraft/shared/network/client/TerminalState.java b/src/main/java/dan200/computercraft/shared/network/client/TerminalState.java
index 1f88b5696..ff53903cd 100644
--- a/src/main/java/dan200/computercraft/shared/network/client/TerminalState.java
+++ b/src/main/java/dan200/computercraft/shared/network/client/TerminalState.java
@@ -54,36 +54,36 @@ public TerminalState( boolean colour, @Nullable Terminal terminal, boolean compr
 
         if( terminal == null )
         {
-            this.width = this.height = 0;
-            this.buffer = null;
+            width = height = 0;
+            buffer = null;
         }
         else
         {
-            this.width = terminal.getWidth();
-            this.height = terminal.getHeight();
+            width = terminal.getWidth();
+            height = terminal.getHeight();
 
-            ByteBuf buf = this.buffer = Unpooled.buffer();
+            ByteBuf buf = buffer = Unpooled.buffer();
             terminal.write( new PacketBuffer( buf ) );
         }
     }
 
     public TerminalState( PacketBuffer buf )
     {
-        this.colour = buf.readBoolean();
-        this.compress = buf.readBoolean();
+        colour = buf.readBoolean();
+        compress = buf.readBoolean();
 
         if( buf.readBoolean() )
         {
-            this.width = buf.readVarInt();
-            this.height = buf.readVarInt();
+            width = buf.readVarInt();
+            height = buf.readVarInt();
 
             int length = buf.readVarInt();
-            this.buffer = readCompressed( buf, length, compress );
+            buffer = readCompressed( buf, length, compress );
         }
         else
         {
-            this.width = this.height = 0;
-            this.buffer = null;
+            width = height = 0;
+            buffer = null;
         }
     }
 
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 ed67433da..1d74beb1e 100644
--- a/src/main/java/dan200/computercraft/shared/network/container/ComputerContainerData.java
+++ b/src/main/java/dan200/computercraft/shared/network/container/ComputerContainerData.java
@@ -16,14 +16,14 @@ public class ComputerContainerData implements ContainerData
 
     public ComputerContainerData( ServerComputer computer )
     {
-        this.id = computer.getInstanceID();
-        this.family = computer.getFamily();
+        id = computer.getInstanceID();
+        family = computer.getFamily();
     }
 
     public ComputerContainerData( PacketBuffer buf )
     {
-        this.id = buf.readInt();
-        this.family = buf.readEnum( ComputerFamily.class );
+        id = buf.readInt();
+        family = buf.readEnum( ComputerFamily.class );
     }
 
     @Override
diff --git a/src/main/java/dan200/computercraft/shared/peripheral/generic/SaturatedMethod.java b/src/main/java/dan200/computercraft/shared/peripheral/generic/SaturatedMethod.java
index 31a120e52..eca38e63f 100644
--- a/src/main/java/dan200/computercraft/shared/peripheral/generic/SaturatedMethod.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/generic/SaturatedMethod.java
@@ -24,7 +24,7 @@ final class SaturatedMethod
     SaturatedMethod( Object target, NamedMethod<PeripheralMethod> method )
     {
         this.target = target;
-        this.name = method.getName();
+        name = method.getName();
         this.method = method.getMethod();
     }
 
diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileCable.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileCable.java
index 371fc19e4..a0fa200db 100644
--- a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileCable.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileCable.java
@@ -53,7 +53,7 @@ private class CableElement extends WiredModemElement
         @Override
         public World getWorld()
         {
-            return TileCable.this.getLevel();
+            return getLevel();
         }
 
         @Nonnull
diff --git a/src/main/java/dan200/computercraft/shared/pocket/inventory/ContainerPocketComputer.java b/src/main/java/dan200/computercraft/shared/pocket/inventory/ContainerPocketComputer.java
index e49aa6b97..3cf67f103 100644
--- a/src/main/java/dan200/computercraft/shared/pocket/inventory/ContainerPocketComputer.java
+++ b/src/main/java/dan200/computercraft/shared/pocket/inventory/ContainerPocketComputer.java
@@ -46,7 +46,7 @@ public static class Factory implements INamedContainerProvider
         public Factory( ServerComputer computer, ItemStack stack, ItemPocketComputer item, Hand hand )
         {
             this.computer = computer;
-            this.name = stack.getHoverName();
+            name = stack.getHoverName();
             this.item = item;
             this.hand = hand;
         }
diff --git a/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleTool.java b/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleTool.java
index 62b6bab06..e2c80a69a 100644
--- a/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleTool.java
+++ b/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleTool.java
@@ -65,7 +65,7 @@ public TurtleTool( ResourceLocation id, Item item )
     public TurtleTool( ResourceLocation id, ItemStack craftItem, ItemStack toolItem )
     {
         super( id, TurtleUpgradeType.TOOL, craftItem );
-        this.item = toolItem;
+        item = toolItem;
     }
 
     @Override
diff --git a/src/main/java/dan200/computercraft/shared/util/FakeNetHandler.java b/src/main/java/dan200/computercraft/shared/util/FakeNetHandler.java
index 9670068ea..cd41b222f 100644
--- a/src/main/java/dan200/computercraft/shared/util/FakeNetHandler.java
+++ b/src/main/java/dan200/computercraft/shared/util/FakeNetHandler.java
@@ -324,7 +324,7 @@ public void tick()
         @Override
         public void disconnect( @Nonnull ITextComponent message )
         {
-            this.closeReason = message;
+            closeReason = message;
         }
 
         @Override