From c84db86457b0aad396854d980eb1cc9175a7d747 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Tue, 8 Aug 2023 10:04:32 +0000
Subject: [PATCH] Refactor and cleanup

---
 README.md                                     |  2 +-
 .../io/xpipe/api/impl/DataSourceImpl.java     |  6 ++---
 .../java/io/xpipe/api/impl/DataTableImpl.java |  2 +-
 app/build.gradle                              |  2 +-
 .../xpipe/app/browser/BrowserClipboard.java   |  3 +--
 .../xpipe/app/browser/BrowserContextMenu.java |  3 +--
 .../app/browser/BrowserFileListComp.java      |  3 +--
 .../io/xpipe/app/browser/BrowserNavBar.java   |  3 +--
 .../app/browser/BrowserOverviewComp.java      |  3 +--
 .../xpipe/app/browser/BrowserSavedState.java  |  3 +--
 .../app/browser/BrowserSelectionListComp.java |  3 +--
 .../io/xpipe/app/comp/DeveloperTabComp.java   |  3 +--
 .../io/xpipe/app/comp/base/CountComp.java     |  2 +-
 .../app/comp/base/IntegratedTextAreaComp.java |  3 +--
 .../io/xpipe/app/comp/base/MarkdownComp.java  |  4 +--
 .../io/xpipe/app/comp/base/OsLogoComp.java    |  3 +--
 .../xpipe/app/comp/base/SystemStateComp.java  | 11 ++++----
 .../storage/store/DenseStoreEntryComp.java    |  2 --
 .../comp/storage/store/StoreEntryComp.java    |  3 +--
 .../store/StoreEntryFlatMiniSectionComp.java  |  3 +--
 .../comp/storage/store/StoreNotFoundComp.java |  3 +--
 .../xpipe/app/core/AppActionLinkDetector.java |  3 +--
 .../main/java/io/xpipe/app/core/AppFont.java  |  2 +-
 .../java/io/xpipe/app/core/AppGreetings.java  |  1 +
 .../app/exchange/MessageExchangeImpls.java    |  3 +--
 .../exchange/cli/ReadDrainExchangeImpl.java   |  2 +-
 .../io/xpipe/app/ext/DataStoreProvider.java   |  8 +++---
 .../app/fxcomps/impl/DataStoreChoiceComp.java |  2 +-
 .../app/fxcomps/impl/DynamicOptionsComp.java  |  6 ++---
 .../impl/FileSystemStoreChoiceComp.java       |  3 +--
 .../xpipe/app/fxcomps/impl/OptionsComp.java   |  3 +--
 .../app/fxcomps/util/BindingsHelper.java      |  1 +
 .../app/fxcomps/util/PlatformThread.java      | 23 ++++++++--------
 .../io/xpipe/app/issue/ErrorDetailsComp.java  |  3 +--
 .../java/io/xpipe/app/issue/ErrorEvent.java   |  2 +-
 .../io/xpipe/app/issue/UserReportComp.java    |  3 +--
 .../java/io/xpipe/app/prefs/AboutComp.java    |  3 +--
 .../io/xpipe/app/prefs/CloseBehaviour.java    |  4 ---
 .../xpipe/app/prefs/ExternalEditorType.java   |  6 +----
 .../app/prefs/QuietResourceBundleService.java |  6 ++---
 .../io/xpipe/app/prefs/StartupBehaviour.java  |  3 ---
 .../io/xpipe/app/storage/DataStorage.java     |  6 ++---
 .../xpipe/app/storage/DataStorageWriter.java  |  3 +--
 .../io/xpipe/app/storage/DataStoreEntry.java  | 13 +++-------
 .../app/storage/ImpersistentStorage.java      |  3 +--
 .../io/xpipe/app/storage/StandardStorage.java |  3 +--
 .../java/io/xpipe/app/test/ExtensionTest.java |  3 +--
 .../io/xpipe/app/update/AppDownloads.java     |  6 ++---
 .../io/xpipe/app/update/UpdateHandler.java    |  1 +
 .../xpipe/app/update/XPipeInstanceHelper.java |  5 ++--
 .../io/xpipe/app/util/ApplicationHelper.java  |  3 +--
 .../io/xpipe/app/util/DefaultSecretValue.java |  3 +--
 .../java/io/xpipe/app/util/HttpHelper.java    |  3 ++-
 .../io/xpipe/app/util/LockedSecretValue.java  |  3 +--
 .../app/util/ProxyManagerProviderImpl.java    |  3 +--
 .../java/io/xpipe/app/util/ScanAlert.java     |  3 +--
 .../java/io/xpipe/app/util/ScriptHelper.java  | 12 +++------
 .../app/util/SecretRetrievalStrategy.java     | 12 ++++-----
 .../util/SecretRetrievalStrategyHelper.java   |  3 +--
 .../java/io/xpipe/beacon/BeaconServer.java    |  4 +--
 .../io/xpipe/beacon/SecretProviderImpl.java   |  3 +--
 .../beacon/exchange/MessageExchange.java      |  2 --
 .../beacon/exchange/MessageExchanges.java     |  3 +--
 .../io/xpipe/core/charsetter/Charsetter.java  |  3 +--
 .../io/xpipe/core/data/node/ArrayNode.java    |  1 +
 .../core/data/node/DataStructureNodeIO.java   |  3 +--
 .../io/xpipe/core/data/node/TupleNode.java    |  1 +
 .../io/xpipe/core/data/node/ValueNode.java    |  1 +
 .../java/io/xpipe/core/dialog/Dialog.java     |  3 +--
 .../io/xpipe/core/dialog/DialogReference.java |  2 +-
 .../xpipe/core/impl/InternalStreamStore.java  |  5 ----
 .../impl/PeekTableStreamReadConnection.java   |  9 -------
 .../io/xpipe/core/process/CommandBuilder.java |  2 +-
 .../io/xpipe/core/process/ShellControl.java   | 26 +++----------------
 .../java/io/xpipe/core/util/SecretValue.java  |  3 +--
 .../io/xpipe/core/util/XPipeInstallation.java |  3 +--
 .../java/io/xpipe/ext/base/HttpStore.java     |  6 ++---
 .../ext/base/InternalStreamProvider.java      | 10 -------
 .../base/SimpleFileDataSourceProvider.java    |  3 +--
 .../action/DeleteStoreChildrenAction.java     |  5 ----
 .../ext/base/action/LaunchShortcutAction.java |  4 ---
 .../io/xpipe/ext/base/browser/BackAction.java |  5 ----
 .../ext/base/browser/CopyPathAction.java      |  5 ----
 .../xpipe/ext/base/browser/ForwardAction.java |  5 ----
 .../base/browser/RefreshDirectoryAction.java  |  5 ----
 .../io/xpipe/ext/csv/CsvReadConnection.java   |  3 +--
 .../io/xpipe/ext/csv/CsvWriteConnection.java  |  5 ++--
 .../io/xpipe/ext/pdx/PdxFileProvider.java     |  3 +--
 .../io/xpipe/ext/pdx/PdxTextFileProvider.java |  3 +--
 .../ext/pdx/parser/TextFormatParser.java      |  3 +--
 90 files changed, 119 insertions(+), 265 deletions(-)

diff --git a/README.md b/README.md
index f8af32955..5528c7333 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ The feature set is the same for all supported connection types. It of course als
 
 <br>
 <p align="center">
-  <img src="https://github.com/xpipe-io/xpipe/assets/72509152/f3d29909-acd7-4568-a625-0667d936ef2b" />
+  <img src="https://github.com/xpipe-io/xpipe/assets/72509152/f3d29909-acd7-4568-a625-0667d936ef2b" alt="Terminal launcher"/>
 </p>
 <br>
 
diff --git a/api/src/main/java/io/xpipe/api/impl/DataSourceImpl.java b/api/src/main/java/io/xpipe/api/impl/DataSourceImpl.java
index e43af2464..82e4251a5 100644
--- a/api/src/main/java/io/xpipe/api/impl/DataSourceImpl.java
+++ b/api/src/main/java/io/xpipe/api/impl/DataSourceImpl.java
@@ -83,8 +83,7 @@ public static DataSource create(DataStoreId id, String type, DataStore store) {
                 .configureAll(false)
                 .build();
         var startRes = XPipeApiConnection.execute(con -> {
-            ReadExchange.Response r = con.performSimpleExchange(startReq);
-            return r;
+            return con.<ReadExchange.Request, ReadExchange.Response>performSimpleExchange(startReq);
         });
 
         var configInstance = startRes.getConfig();
@@ -113,8 +112,7 @@ public static DataSource create(DataStoreId id, String type, InputStream in) {
                 .configureAll(false)
                 .build();
         var startRes = XPipeApiConnection.execute(con -> {
-            ReadExchange.Response r = con.performSimpleExchange(startReq);
-            return r;
+            return con.<ReadExchange.Request, ReadExchange.Response>performSimpleExchange(startReq);
         });
 
         var configInstance = startRes.getConfig();
diff --git a/api/src/main/java/io/xpipe/api/impl/DataTableImpl.java b/api/src/main/java/io/xpipe/api/impl/DataTableImpl.java
index 4862964c6..7b06e22f6 100644
--- a/api/src/main/java/io/xpipe/api/impl/DataTableImpl.java
+++ b/api/src/main/java/io/xpipe/api/impl/DataTableImpl.java
@@ -46,7 +46,7 @@ public ArrayNode read(int maxRows) {
 
     @Override
     public Iterator<TupleNode> iterator() {
-        return new Iterator<TupleNode>() {
+        return new Iterator<>() {
             @Override
             public boolean hasNext() {
                 return false;
diff --git a/app/build.gradle b/app/build.gradle
index 57e2ec8f2..e2613f529 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -83,7 +83,7 @@ dependencies {
     testImplementation project(':core')
 }
 
-project.allExtensions.forEach(p -> {
+project.allExtensions.forEach((Project p) -> {
     dependencies {
         testCompileOnly p
     }
diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserClipboard.java b/app/src/main/java/io/xpipe/app/browser/BrowserClipboard.java
index b757351ea..e99f50f13 100644
--- a/app/src/main/java/io/xpipe/app/browser/BrowserClipboard.java
+++ b/app/src/main/java/io/xpipe/app/browser/BrowserClipboard.java
@@ -40,8 +40,7 @@ public static void startCopy(FileSystem.FileEntry base, List<FileSystem.FileEntr
     }
 
     public static Instance retrieveCopy() {
-        var current = currentCopyClipboard;
-        return current.getValue();
+        return currentCopyClipboard.getValue();
     }
 
     public static Instance retrieveDrag(Dragboard dragboard) {
diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserContextMenu.java b/app/src/main/java/io/xpipe/app/browser/BrowserContextMenu.java
index d4faff3a1..bee1fc6aa 100644
--- a/app/src/main/java/io/xpipe/app/browser/BrowserContextMenu.java
+++ b/app/src/main/java/io/xpipe/app/browser/BrowserContextMenu.java
@@ -85,7 +85,7 @@ private void createMenu() {
     }
 
     private static List<BrowserEntry> resolveIfNeeded(BrowserAction action, List<BrowserEntry> selected) {
-        var used = action.automaticallyResolveLinks()
+        return action.automaticallyResolveLinks()
                 ? selected.stream()
                 .map(browserEntry -> new BrowserEntry(
                         browserEntry.getRawFileEntry().resolved(),
@@ -93,6 +93,5 @@ private static List<BrowserEntry> resolveIfNeeded(BrowserAction action, List<Bro
                         browserEntry.isSynthetic()))
                 .toList()
                 : selected;
-        return used;
     }
 }
diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserFileListComp.java b/app/src/main/java/io/xpipe/app/browser/BrowserFileListComp.java
index c8aaf7927..d5090e99f 100644
--- a/app/src/main/java/io/xpipe/app/browser/BrowserFileListComp.java
+++ b/app/src/main/java/io/xpipe/app/browser/BrowserFileListComp.java
@@ -65,8 +65,7 @@ public BrowserFileListComp(BrowserFileListModel fileList) {
 
     @Override
     protected Region createSimple() {
-        TableView<BrowserEntry> table = createTable();
-        return table;
+        return createTable();
     }
 
     @SuppressWarnings("unchecked")
diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserNavBar.java b/app/src/main/java/io/xpipe/app/browser/BrowserNavBar.java
index a5df651d2..9a16b8c1e 100644
--- a/app/src/main/java/io/xpipe/app/browser/BrowserNavBar.java
+++ b/app/src/main/java/io/xpipe/app/browser/BrowserNavBar.java
@@ -89,10 +89,9 @@ protected Region createSimple() {
 
         var graphic = Bindings.createStringBinding(
                 () -> {
-                    var icon = model.getCurrentDirectory() != null
+                    return model.getCurrentDirectory() != null
                             ? FileIconManager.getFileIcon(model.getCurrentDirectory(), false)
                             : "home_icon.svg";
-                    return icon;
                 },
                 model.getCurrentPath());
         var breadcrumbsGraphic = new PrettyImageComp(graphic, 22, 22)
diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserOverviewComp.java b/app/src/main/java/io/xpipe/app/browser/BrowserOverviewComp.java
index fb388b0c9..38546dd3c 100644
--- a/app/src/main/java/io/xpipe/app/browser/BrowserOverviewComp.java
+++ b/app/src/main/java/io/xpipe/app/browser/BrowserOverviewComp.java
@@ -33,10 +33,9 @@ protected Region createSimple() {
                 .map(s -> FileSystem.FileEntry.ofDirectory(model.getFileSystem(), s))
                 .filter(entry -> {
                     try {
-                        var b = sc.getShellDialect()
+                        return sc.getShellDialect()
                                 .directoryExists(sc, entry.getPath())
                                 .executeAndCheck();
-                        return b;
                     } catch (Exception e) {
                         ErrorEvent.fromThrowable(e).handle();
                         return false;
diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserSavedState.java b/app/src/main/java/io/xpipe/app/browser/BrowserSavedState.java
index b2b426119..7547f35f2 100644
--- a/app/src/main/java/io/xpipe/app/browser/BrowserSavedState.java
+++ b/app/src/main/java/io/xpipe/app/browser/BrowserSavedState.java
@@ -17,10 +17,9 @@
 public class BrowserSavedState {
 
     static BrowserSavedState load() {
-        BrowserSavedState state = AppCache.get("browser-state", BrowserSavedState.class, () -> {
+        return AppCache.get("browser-state", BrowserSavedState.class, () -> {
             return null;
         });
-        return state;
     }
 
     @Value
diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserSelectionListComp.java b/app/src/main/java/io/xpipe/app/browser/BrowserSelectionListComp.java
index 892a6bbcd..9df516a6c 100644
--- a/app/src/main/java/io/xpipe/app/browser/BrowserSelectionListComp.java
+++ b/app/src/main/java/io/xpipe/app/browser/BrowserSelectionListComp.java
@@ -40,8 +40,7 @@ public static Image snapshot(ObservableList<FileSystem.FileEntry> list) {
         AppStyle.addStylesheets(scene);
         SnapshotParameters parameters = new SnapshotParameters();
         parameters.setFill(Color.TRANSPARENT);
-        WritableImage image = r.snapshot(parameters, null);
-        return image;
+        return r.snapshot(parameters, null);
     }
 
     ObservableList<FileSystem.FileEntry> list;
diff --git a/app/src/main/java/io/xpipe/app/comp/DeveloperTabComp.java b/app/src/main/java/io/xpipe/app/comp/DeveloperTabComp.java
index 4b0786d01..0cd955ac9 100644
--- a/app/src/main/java/io/xpipe/app/comp/DeveloperTabComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/DeveloperTabComp.java
@@ -43,12 +43,11 @@ protected Region createSimple() {
 
         var button5 = new ButtonComp(AppI18n.observable("Operation mode null"), null, OperationMode::close);
 
-        var box = new HBox(
+        return new HBox(
                 button.createRegion(),
                 button2.createRegion(),
                 button3.createRegion(),
                 button4.createRegion(),
                 button5.createRegion());
-        return box;
     }
 }
diff --git a/app/src/main/java/io/xpipe/app/comp/base/CountComp.java b/app/src/main/java/io/xpipe/app/comp/base/CountComp.java
index 542332476..a420bd804 100644
--- a/app/src/main/java/io/xpipe/app/comp/base/CountComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/base/CountComp.java
@@ -31,7 +31,7 @@ public CompStructure<Label> createBase() {
                             if (sub.size() == all.size()) {
                                 return all.size() + "";
                             } else {
-                                return "" + sub.size() + "/" + all.size();
+                                return sub.size() + "/" + all.size();
                             }
                         },
                         sub,
diff --git a/app/src/main/java/io/xpipe/app/comp/base/IntegratedTextAreaComp.java b/app/src/main/java/io/xpipe/app/comp/base/IntegratedTextAreaComp.java
index b6c1b3908..4c5d4e1d8 100644
--- a/app/src/main/java/io/xpipe/app/comp/base/IntegratedTextAreaComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/base/IntegratedTextAreaComp.java
@@ -49,7 +49,7 @@ protected Region createSimple() {
     }
 
     private Region createOpenButton(Region container) {
-        var button = new IconButtonComp(
+        return new IconButtonComp(
                         "mdal-edit",
                         () -> FileOpener.openString(
                                 identifier + (fileType.getValue() != null ? "." + fileType.getValue() : ""),
@@ -59,6 +59,5 @@ private Region createOpenButton(Region container) {
                                     Platform.runLater(() -> value.setValue(s));
                                 }))
                 .createRegion();
-        return button;
     }
 }
diff --git a/app/src/main/java/io/xpipe/app/comp/base/MarkdownComp.java b/app/src/main/java/io/xpipe/app/comp/base/MarkdownComp.java
index 831754931..96c3aa9f3 100644
--- a/app/src/main/java/io/xpipe/app/comp/base/MarkdownComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/base/MarkdownComp.java
@@ -24,7 +24,7 @@
 
 import java.awt.*;
 import java.io.IOException;
-import java.net.URL;
+import java.net.URI;
 import java.nio.file.Files;
 import java.util.function.UnaryOperator;
 
@@ -87,7 +87,7 @@ private void addLinkHandler(WebEngine engine) {
                     if (toBeopen.contains("http://") || toBeopen.contains("https://")) {
                         engine.getLoadWorker().cancel();
                         try {
-                            Desktop.getDesktop().browse(new URL(toBeopen).toURI());
+                            Desktop.getDesktop().browse(URI.create(toBeopen));
                         } catch (Exception e) {
                             ErrorEvent.fromThrowable(e).omit().handle();
                         }
diff --git a/app/src/main/java/io/xpipe/app/comp/base/OsLogoComp.java b/app/src/main/java/io/xpipe/app/comp/base/OsLogoComp.java
index b336cae6e..3b4ed1078 100644
--- a/app/src/main/java/io/xpipe/app/comp/base/OsLogoComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/base/OsLogoComp.java
@@ -53,7 +53,6 @@ private String getImage(String name) {
             });
         }
 
-        var found = ICONS.entrySet().stream().filter(e->name.toLowerCase().contains(e.getKey())).findAny().map(e->e.getValue()).orElse("os/" + LINUX_DEFAULT);
-        return found;
+        return ICONS.entrySet().stream().filter(e->name.toLowerCase().contains(e.getKey())).findAny().map(e->e.getValue()).orElse("os/" + LINUX_DEFAULT);
     }
 }
diff --git a/app/src/main/java/io/xpipe/app/comp/base/SystemStateComp.java b/app/src/main/java/io/xpipe/app/comp/base/SystemStateComp.java
index c14f26210..aea5c199a 100644
--- a/app/src/main/java/io/xpipe/app/comp/base/SystemStateComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/base/SystemStateComp.java
@@ -20,7 +20,7 @@ public SystemStateComp(ObservableValue<State> state) {
         this.state = state;
     }
 
-    public static enum State {
+    public enum State {
         FAILURE,
         SUCCESS,
         OTHER
@@ -29,16 +29,15 @@ public static enum State {
     private final ObservableValue<State> state;
 
     public SystemStateComp(StoreEntryWrapper w) {
-        var state = Bindings.createObjectBinding(
+        this.state = Bindings.createObjectBinding(
                 () -> {
                     return w.getState().getValue() == DataStoreEntry.State.COMPLETE_BUT_INVALID
-                            ? SystemStateComp.State.FAILURE
+                            ? State.FAILURE
                             : w.getState().getValue() == DataStoreEntry.State.COMPLETE_AND_VALID
-                            ? SystemStateComp.State.SUCCESS
-                            : SystemStateComp.State.OTHER;
+                            ? State.SUCCESS
+                            : State.OTHER;
                 },
                 w.getState());
-        this.state = state;
     }
 
     @Override
diff --git a/app/src/main/java/io/xpipe/app/comp/storage/store/DenseStoreEntryComp.java b/app/src/main/java/io/xpipe/app/comp/storage/store/DenseStoreEntryComp.java
index 829fa3d3d..3fb435947 100644
--- a/app/src/main/java/io/xpipe/app/comp/storage/store/DenseStoreEntryComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/storage/store/DenseStoreEntryComp.java
@@ -22,13 +22,11 @@ protected Region createContent() {
         var grid = new GridPane();
         grid.setHgap(8);
 
-        int index = 0;
         if (showIcon) {
             var storeIcon = createIcon(26, 21);
             grid.getColumnConstraints().add(new ColumnConstraints(26));
             grid.add(storeIcon, 0, 0);
             GridPane.setHalignment(storeIcon, HPos.CENTER);
-            index++;
         }
 
         var customSize = content != null ? 300 : 0;
diff --git a/app/src/main/java/io/xpipe/app/comp/storage/store/StoreEntryComp.java b/app/src/main/java/io/xpipe/app/comp/storage/store/StoreEntryComp.java
index b6c2c810e..efe9e5cbe 100644
--- a/app/src/main/java/io/xpipe/app/comp/storage/store/StoreEntryComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/storage/store/StoreEntryComp.java
@@ -84,8 +84,7 @@ protected final Region createSimple() {
         new ContextMenuAugment<>(() -> this.createContextMenu()).augment(new SimpleCompStructure<>(button));
 
         var loading = new LoadingOverlayComp(Comp.of(() -> button), wrapper.getValidating());
-        var region = loading.createRegion();
-        return region;
+        return loading.createRegion();
     }
 
     protected abstract Region createContent();
diff --git a/app/src/main/java/io/xpipe/app/comp/storage/store/StoreEntryFlatMiniSectionComp.java b/app/src/main/java/io/xpipe/app/comp/storage/store/StoreEntryFlatMiniSectionComp.java
index c6e574d3f..8175b1bcf 100644
--- a/app/src/main/java/io/xpipe/app/comp/storage/store/StoreEntryFlatMiniSectionComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/storage/store/StoreEntryFlatMiniSectionComp.java
@@ -57,7 +57,6 @@ protected Region createSimple() {
         var label =
                 new Label(entry.getName(), new PrettyImageComp(new SimpleStringProperty(image), 20, 20).createRegion());
         var spacer = new Spacer(depth * 10, Orientation.HORIZONTAL);
-        var box = new HBox(spacer, label);
-        return box;
+        return new HBox(spacer, label);
     }
 }
diff --git a/app/src/main/java/io/xpipe/app/comp/storage/store/StoreNotFoundComp.java b/app/src/main/java/io/xpipe/app/comp/storage/store/StoreNotFoundComp.java
index c49790af9..34838ac5c 100644
--- a/app/src/main/java/io/xpipe/app/comp/storage/store/StoreNotFoundComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/storage/store/StoreNotFoundComp.java
@@ -8,7 +8,6 @@ public class StoreNotFoundComp extends SimpleComp {
 
     @Override
     public Region createSimple() {
-        var sp = new StackPane();
-        return sp;
+        return new StackPane();
     }
 }
diff --git a/app/src/main/java/io/xpipe/app/core/AppActionLinkDetector.java b/app/src/main/java/io/xpipe/app/core/AppActionLinkDetector.java
index e6dea0380..c2357fa64 100644
--- a/app/src/main/java/io/xpipe/app/core/AppActionLinkDetector.java
+++ b/app/src/main/java/io/xpipe/app/core/AppActionLinkDetector.java
@@ -60,7 +60,7 @@ public static void detectOnPaste() {
     }
 
     private static boolean showAlert() {
-        var paste = AppWindowHelper.showBlockingAlert(alert -> {
+        return AppWindowHelper.showBlockingAlert(alert -> {
                     alert.setAlertType(Alert.AlertType.CONFIRMATION);
                     alert.setTitle(AppI18n.get("clipboardActionDetectedTitle"));
                     alert.setHeaderText(AppI18n.get("clipboardActionDetectedHeader"));
@@ -70,6 +70,5 @@ private static boolean showAlert() {
                 })
                 .map(buttonType -> buttonType.getButtonData().isDefaultButton())
                 .orElse(false);
-        return paste;
     }
 }
diff --git a/app/src/main/java/io/xpipe/app/core/AppFont.java b/app/src/main/java/io/xpipe/app/core/AppFont.java
index d6343ba62..d7fdbfa4f 100644
--- a/app/src/main/java/io/xpipe/app/core/AppFont.java
+++ b/app/src/main/java/io/xpipe/app/core/AppFont.java
@@ -66,7 +66,7 @@ public static void loadFonts() {
                 "fonts",
                 path -> Files.walkFileTree(path, new SimpleFileVisitor<>() {
                     @Override
-                    public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                    public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
                         try (var in = Files.newInputStream(file)) {
                             Font.loadFont(in, 12);
                         } catch (Throwable t) {
diff --git a/app/src/main/java/io/xpipe/app/core/AppGreetings.java b/app/src/main/java/io/xpipe/app/core/AppGreetings.java
index 322db7097..13cf650ae 100644
--- a/app/src/main/java/io/xpipe/app/core/AppGreetings.java
+++ b/app/src/main/java/io/xpipe/app/core/AppGreetings.java
@@ -67,6 +67,7 @@ private static TitledPane createEULA() {
 
     public static void showIfNeeded() {
         // TODO
+        //noinspection PointlessBooleanExpression
         if (!AppProperties.get().isImage() || true) {
             return;
         }
diff --git a/app/src/main/java/io/xpipe/app/exchange/MessageExchangeImpls.java b/app/src/main/java/io/xpipe/app/exchange/MessageExchangeImpls.java
index 31e0f3391..b318e8069 100644
--- a/app/src/main/java/io/xpipe/app/exchange/MessageExchangeImpls.java
+++ b/app/src/main/java/io/xpipe/app/exchange/MessageExchangeImpls.java
@@ -16,9 +16,8 @@ public class MessageExchangeImpls {
     public static void loadAll() {
         ALL = ServiceLoader.load(MessageExchangeImpl.class).stream()
                 .map(s -> {
-                    var ex = (MessageExchangeImpl<?, ?>) s.get();
                     // TrackEvent.trace("init", "Loaded exchange implementation " + ex.getId());
-                    return ex;
+                    return (MessageExchangeImpl<?, ?>) s.get();
                 })
                 .collect(Collectors.toList());
 
diff --git a/app/src/main/java/io/xpipe/app/exchange/cli/ReadDrainExchangeImpl.java b/app/src/main/java/io/xpipe/app/exchange/cli/ReadDrainExchangeImpl.java
index d4597822e..2cc03a8f4 100644
--- a/app/src/main/java/io/xpipe/app/exchange/cli/ReadDrainExchangeImpl.java
+++ b/app/src/main/java/io/xpipe/app/exchange/cli/ReadDrainExchangeImpl.java
@@ -8,7 +8,7 @@ public class ReadDrainExchangeImpl extends ReadDrainExchange
         implements MessageExchangeImpl<ReadDrainExchange.Request, ReadDrainExchange.Response> {
 
     @Override
-    public Response handleRequest(BeaconHandler handler, Request msg) throws Exception {
+    public Response handleRequest(BeaconHandler handler, Request msg) {
         return ReadDrainExchange.Response.builder().build();
     }
 }
diff --git a/app/src/main/java/io/xpipe/app/ext/DataStoreProvider.java b/app/src/main/java/io/xpipe/app/ext/DataStoreProvider.java
index 72850e52c..3ff258d83 100644
--- a/app/src/main/java/io/xpipe/app/ext/DataStoreProvider.java
+++ b/app/src/main/java/io/xpipe/app/ext/DataStoreProvider.java
@@ -81,10 +81,9 @@ default Comp<?> createInsightsComp(ObservableValue<DataStore> store) {
                     return createInsightsMarkdown(store.getValue());
                 },
                 store);
-        var markdown = new MarkdownComp(content, s -> s)
+        return new MarkdownComp(content, s -> s)
                 .apply(struc -> struc.get().setPrefWidth(450))
                 .apply(struc -> struc.get().setPrefHeight(200));
-        return markdown;
     }
 
     default String createInsightsMarkdown(DataStore store) {
@@ -124,7 +123,7 @@ default String queryInformationString(DataStore store, int length) throws Except
         return null;
     }
 
-    default String queryInvalidInformationString(DataStore store, int length) throws Exception {
+    default String queryInvalidInformationString(DataStore store, int length) {
         return "Connection failed";
     }
 
@@ -160,8 +159,7 @@ default String getDisplayIconFileName(DataStore store) {
             return png;
         }
 
-        var svg = getModuleName() + ":" + getId() + "_icon.svg";
-        return svg;
+        return getModuleName() + ":" + getId() + "_icon.svg";
     }
 
     default Dialog dialogForStore(DataStore store) {
diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/DataStoreChoiceComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/DataStoreChoiceComp.java
index 92231389a..bc8c2cbb3 100644
--- a/app/src/main/java/io/xpipe/app/fxcomps/impl/DataStoreChoiceComp.java
+++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/DataStoreChoiceComp.java
@@ -23,7 +23,7 @@
 public class DataStoreChoiceComp<T extends DataStore> extends SimpleComp {
 
     public static <T extends DataStore> DataStoreChoiceComp<T> other(Property<T> selected, Class<T> clazz, Predicate<T> filter) {
-        return new DataStoreChoiceComp<T>(Mode.OTHER, null, selected, clazz, filter);
+        return new DataStoreChoiceComp<>(Mode.OTHER, null, selected, clazz, filter);
     }
 
     public static DataStoreChoiceComp<ShellStore> proxy(Property<ShellStore> selected) {
diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/DynamicOptionsComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/DynamicOptionsComp.java
index d626e686f..8d36dff56 100644
--- a/app/src/main/java/io/xpipe/app/fxcomps/impl/DynamicOptionsComp.java
+++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/DynamicOptionsComp.java
@@ -100,11 +100,10 @@ public CompStructure<Pane> createBase() {
                             return Region.USE_COMPUTED_SIZE;
                         }
 
-                        var m = compRegions.stream()
+                        return compRegions.stream()
                                 .map(Region::getWidth)
                                 .max(Double::compareTo)
                                 .orElse(0.0);
-                        return m;
                     },
                     compRegions.stream().map(Region::widthProperty).toList().toArray(new Observable[0]));
             compRegions.forEach(r -> r.prefWidthProperty().bind(compWidthBinding));
@@ -117,11 +116,10 @@ public CompStructure<Pane> createBase() {
                             return Region.USE_COMPUTED_SIZE;
                         }
 
-                        var m = nameRegions.stream()
+                        return nameRegions.stream()
                                 .map(Region::getWidth)
                                 .max(Double::compareTo)
                                 .orElse(0.0);
-                        return m;
                     },
                     nameRegions.stream().map(Region::widthProperty).toList().toArray(new Observable[0]));
             nameRegions.forEach(r -> r.prefWidthProperty().bind(nameWidthBinding));
diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/FileSystemStoreChoiceComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/FileSystemStoreChoiceComp.java
index 3c64f4c87..8aa03bd25 100644
--- a/app/src/main/java/io/xpipe/app/fxcomps/impl/FileSystemStoreChoiceComp.java
+++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/FileSystemStoreChoiceComp.java
@@ -21,12 +21,11 @@ public FileSystemStoreChoiceComp(Property<FileSystemStore> selected) {
     }
 
     private static String getName(FileSystemStore store) {
-        var name = DataStorage.get().getUsableStores().stream()
+        return DataStorage.get().getUsableStores().stream()
                 .filter(e -> e.equals(store))
                 .findAny()
                 .map(e -> DataStorage.get().getStoreDisplayName(e).orElse("?"))
                 .orElse("?");
-        return name;
     }
 
     private Region createGraphic(FileSystemStore s) {
diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/OptionsComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/OptionsComp.java
index e69027dc9..200cb93d7 100644
--- a/app/src/main/java/io/xpipe/app/fxcomps/impl/OptionsComp.java
+++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/OptionsComp.java
@@ -152,12 +152,11 @@ public CompStructure<Pane> createBase() {
         if (entries.stream().anyMatch(entry -> entry.name() != null && entry.description() == null)) {
             var nameWidthBinding = Bindings.createDoubleBinding(
                     () -> {
-                        var m = nameRegions.stream()
+                        return nameRegions.stream()
                                 .map(Region::getWidth)
                                 .filter(aDouble -> aDouble > 0.0)
                                 .max(Double::compareTo)
                                 .orElse(Region.USE_COMPUTED_SIZE);
-                        return m;
                     },
                     nameRegions.stream().map(Region::widthProperty).toList().toArray(new Observable[0]));
             nameRegions.forEach(r -> r.minWidthProperty().bind(nameWidthBinding));
diff --git a/app/src/main/java/io/xpipe/app/fxcomps/util/BindingsHelper.java b/app/src/main/java/io/xpipe/app/fxcomps/util/BindingsHelper.java
index 8042ee07a..73d8526fb 100644
--- a/app/src/main/java/io/xpipe/app/fxcomps/util/BindingsHelper.java
+++ b/app/src/main/java/io/xpipe/app/fxcomps/util/BindingsHelper.java
@@ -17,6 +17,7 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 
+@SuppressWarnings("InfiniteLoopStatement")
 public class BindingsHelper {
 
     private static final Set<ReferenceEntry> REFERENCES = Collections.newSetFromMap(new ConcurrentHashMap<>());
diff --git a/app/src/main/java/io/xpipe/app/fxcomps/util/PlatformThread.java b/app/src/main/java/io/xpipe/app/fxcomps/util/PlatformThread.java
index f18ec1158..7c4465aaf 100644
--- a/app/src/main/java/io/xpipe/app/fxcomps/util/PlatformThread.java
+++ b/app/src/main/java/io/xpipe/app/fxcomps/util/PlatformThread.java
@@ -7,6 +7,7 @@
 import javafx.beans.value.ObservableValue;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
+import lombok.NonNull;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
@@ -151,17 +152,17 @@ public boolean contains(Object o) {
             }
 
             @Override
-            public Iterator<T> iterator() {
+            public @NonNull Iterator<T> iterator() {
                 return ol.iterator();
             }
 
             @Override
-            public Object[] toArray() {
+            public Object @NonNull [] toArray() {
                 return ol.toArray();
             }
 
             @Override
-            public <T1> T1[] toArray(T1[] a) {
+            public <T1> T1 @NonNull [] toArray(T1 @NonNull [] a) {
                 return ol.toArray(a);
             }
 
@@ -176,27 +177,27 @@ public boolean remove(Object o) {
             }
 
             @Override
-            public boolean containsAll(Collection<?> c) {
+            public boolean containsAll(@NonNull Collection<?> c) {
                 return ol.containsAll(c);
             }
 
             @Override
-            public boolean addAll(Collection<? extends T> c) {
+            public boolean addAll(@NonNull Collection<? extends T> c) {
                 return ol.addAll(c);
             }
 
             @Override
-            public boolean addAll(int index, Collection<? extends T> c) {
+            public boolean addAll(int index, @NonNull Collection<? extends T> c) {
                 return ol.addAll(index, c);
             }
 
             @Override
-            public boolean removeAll(Collection<?> c) {
+            public boolean removeAll(@NonNull Collection<?> c) {
                 return ol.removeAll(c);
             }
 
             @Override
-            public boolean retainAll(Collection<?> c) {
+            public boolean retainAll(@NonNull Collection<?> c) {
                 return ol.retainAll(c);
             }
 
@@ -236,17 +237,17 @@ public int lastIndexOf(Object o) {
             }
 
             @Override
-            public ListIterator<T> listIterator() {
+            public @NonNull ListIterator<T> listIterator() {
                 return ol.listIterator();
             }
 
             @Override
-            public ListIterator<T> listIterator(int index) {
+            public @NonNull ListIterator<T> listIterator(int index) {
                 return ol.listIterator(index);
             }
 
             @Override
-            public List<T> subList(int fromIndex, int toIndex) {
+            public @NonNull List<T> subList(int fromIndex, int toIndex) {
                 return ol.subList(fromIndex, toIndex);
             }
 
diff --git a/app/src/main/java/io/xpipe/app/issue/ErrorDetailsComp.java b/app/src/main/java/io/xpipe/app/issue/ErrorDetailsComp.java
index 858535af4..fbb6fe016 100644
--- a/app/src/main/java/io/xpipe/app/issue/ErrorDetailsComp.java
+++ b/app/src/main/java/io/xpipe/app/issue/ErrorDetailsComp.java
@@ -43,7 +43,7 @@ private Region createStrackTraceContent() {
 
     private Comp<?> createTrackEventHistory() {
         var list = FXCollections.observableList(event.getTrackEvents());
-        var comp = new ListViewComp<>(list, list, null, te -> {
+        return new ListViewComp<>(list, list, null, te -> {
             var label = new Label(te.getMessage());
             var i = DateTimeFormatter.ofPattern("HH:mm:ss:SSS")
                     .withZone(ZoneId.systemDefault())
@@ -54,7 +54,6 @@ private Comp<?> createTrackEventHistory() {
             HBox.setHgrow(spacer, Priority.ALWAYS);
             return Comp.of(() -> c);
         });
-        return comp;
     }
 
     @Override
diff --git a/app/src/main/java/io/xpipe/app/issue/ErrorEvent.java b/app/src/main/java/io/xpipe/app/issue/ErrorEvent.java
index 6c4f2c084..bb26be3a0 100644
--- a/app/src/main/java/io/xpipe/app/issue/ErrorEvent.java
+++ b/app/src/main/java/io/xpipe/app/issue/ErrorEvent.java
@@ -93,7 +93,7 @@ public void handle() {
         }
     }
 
-    private static Map<Throwable, ErrorEventBuilder> EVENT_BASES = new ConcurrentHashMap<>();
+    private static final Map<Throwable, ErrorEventBuilder> EVENT_BASES = new ConcurrentHashMap<>();
 
     public static <T extends Throwable> T unreportableIfEndsWith(T t, String... s) {
         return unreportableIf(
diff --git a/app/src/main/java/io/xpipe/app/issue/UserReportComp.java b/app/src/main/java/io/xpipe/app/issue/UserReportComp.java
index c60c334bf..16914a1a6 100644
--- a/app/src/main/java/io/xpipe/app/issue/UserReportComp.java
+++ b/app/src/main/java/io/xpipe/app/issue/UserReportComp.java
@@ -59,11 +59,10 @@ private Comp<?> createAttachments() {
                         includedDiagnostics,
                         false)
                 .styleClass("attachment-list");
-        var tp = new TitledPaneComp(AppI18n.observable("additionalErrorAttachments"), list, 100)
+        return new TitledPaneComp(AppI18n.observable("additionalErrorAttachments"), list, 100)
                 .apply(struc -> struc.get().setExpanded(true))
                 .apply(s -> AppFont.medium(s.get()))
                 .styleClass("attachments");
-        return tp;
     }
 
     @Override
diff --git a/app/src/main/java/io/xpipe/app/prefs/AboutComp.java b/app/src/main/java/io/xpipe/app/prefs/AboutComp.java
index 369b7daa1..c748952a8 100644
--- a/app/src/main/java/io/xpipe/app/prefs/AboutComp.java
+++ b/app/src/main/java/io/xpipe/app/prefs/AboutComp.java
@@ -17,8 +17,7 @@
 public class AboutComp extends Comp<CompStructure<?>> {
 
     private Region createDepsList() {
-        var deps = new ThirdPartyDependencyListComp().createRegion();
-        return deps;
+        return new ThirdPartyDependencyListComp().createRegion();
     }
 
     private Comp<?> createLinks() {
diff --git a/app/src/main/java/io/xpipe/app/prefs/CloseBehaviour.java b/app/src/main/java/io/xpipe/app/prefs/CloseBehaviour.java
index 52bcf84e1..c876b30e3 100644
--- a/app/src/main/java/io/xpipe/app/prefs/CloseBehaviour.java
+++ b/app/src/main/java/io/xpipe/app/prefs/CloseBehaviour.java
@@ -12,10 +12,6 @@ public void run() {
             OperationMode.shutdown(false, false);
         }
 
-        @Override
-        public boolean isSelectable() {
-            return true;
-        }
     },
 
     MINIMIZE_TO_TRAY("app.minimizeToTray") {
diff --git a/app/src/main/java/io/xpipe/app/prefs/ExternalEditorType.java b/app/src/main/java/io/xpipe/app/prefs/ExternalEditorType.java
index 975bc0558..e7cbe65ed 100644
--- a/app/src/main/java/io/xpipe/app/prefs/ExternalEditorType.java
+++ b/app/src/main/java/io/xpipe/app/prefs/ExternalEditorType.java
@@ -123,11 +123,6 @@ public void launch(Path file) throws Exception {
             ApplicationHelper.executeLocalApplication(sc -> ApplicationHelper.replaceFileArgument(format, "FILE", file.toString()), true);
         }
 
-        @Override
-        public boolean isSelectable() {
-            return true;
-        }
-
         @Override
         public String getId() {
             return "app.custom";
@@ -195,6 +190,7 @@ public void launch(Path file) throws Exception {
     List<LinuxPathType> LINUX_EDITORS = List.of(VSCODE_LINUX, KATE, GEDIT, PLUMA, LEAFPAD, MOUSEPAD);
     List<ExternalEditorType> MACOS_EDITORS = List.of(BBEDIT, VSCODE_MACOS, SUBLIME_MACOS, TEXT_EDIT);
 
+    @SuppressWarnings("TrivialFunctionalExpressionUsage")
     List<ExternalEditorType> ALL = ((Supplier<List<ExternalEditorType>>) () -> {
                 var all = new ArrayList<ExternalEditorType>();
                 if (OsType.getLocal().equals(OsType.WINDOWS)) {
diff --git a/app/src/main/java/io/xpipe/app/prefs/QuietResourceBundleService.java b/app/src/main/java/io/xpipe/app/prefs/QuietResourceBundleService.java
index df50e5f58..3ed0faf4e 100644
--- a/app/src/main/java/io/xpipe/app/prefs/QuietResourceBundleService.java
+++ b/app/src/main/java/io/xpipe/app/prefs/QuietResourceBundleService.java
@@ -2,6 +2,7 @@
 
 import com.dlsc.formsfx.model.util.ResourceBundleService;
 import io.xpipe.app.core.AppI18n;
+import lombok.NonNull;
 
 import java.util.Enumeration;
 import java.util.ResourceBundle;
@@ -11,7 +12,7 @@ public class QuietResourceBundleService extends ResourceBundleService {
     public QuietResourceBundleService() {
         super(new ResourceBundle() {
             @Override
-            protected Object handleGetObject(String key) {
+            protected Object handleGetObject(@NonNull String key) {
                 return null;
             }
 
@@ -24,7 +25,6 @@ public Enumeration<String> getKeys() {
 
     @Override
     public String translate(String key) {
-        var value = AppI18n.get(key);
-        return value;
+        return AppI18n.get(key);
     }
 }
diff --git a/app/src/main/java/io/xpipe/app/prefs/StartupBehaviour.java b/app/src/main/java/io/xpipe/app/prefs/StartupBehaviour.java
index 9ced11aa7..53460b835 100644
--- a/app/src/main/java/io/xpipe/app/prefs/StartupBehaviour.java
+++ b/app/src/main/java/io/xpipe/app/prefs/StartupBehaviour.java
@@ -10,9 +10,6 @@
 @AllArgsConstructor
 public enum StartupBehaviour implements PrefsChoiceValue {
     GUI("app.startGui", XPipeDaemonMode.GUI) {
-        public boolean isSelectable() {
-            return true;
-        }
     },
     TRAY("app.startInTray", XPipeDaemonMode.TRAY) {
 
diff --git a/app/src/main/java/io/xpipe/app/storage/DataStorage.java b/app/src/main/java/io/xpipe/app/storage/DataStorage.java
index 37ac7689a..296af01f6 100644
--- a/app/src/main/java/io/xpipe/app/storage/DataStorage.java
+++ b/app/src/main/java/io/xpipe/app/storage/DataStorage.java
@@ -267,13 +267,12 @@ public DataStoreId getId(DataStoreEntry entry) {
     }
 
     public synchronized DataStoreEntry getStoreEntry(@NonNull DataStore store) {
-        var entry = storeEntries.stream()
+        return storeEntries.stream()
                 .filter(n -> n.getStore() != null
                         && Objects.equals(store.getClass(), n.getStore().getClass())
                         && store.equals(n.getStore()))
                 .findFirst()
                 .orElseThrow(() -> new IllegalArgumentException("Store not found"));
-        return entry;
     }
 
     public synchronized Optional<DataStoreEntry> getStoreEntryIfPresent(@NonNull DataStoreId id) {
@@ -300,14 +299,13 @@ public synchronized Optional<DataStoreEntry> getStoreEntryIfPresent(@NonNull Dat
     }
 
     public synchronized Optional<DataStoreEntry> getStoreEntryIfPresent(@NonNull DataStore store) {
-        var entry = storeEntries.stream()
+        return storeEntries.stream()
                 .filter(n -> {
                     return n.getStore() != null
                             && store.getClass().equals(n.getStore().getClass())
                             && store.equals(n.getStore());
                 })
                 .findFirst();
-        return entry;
     }
 
     public synchronized Optional<DataStoreEntry> getStoreEntryIfPresent(@NonNull String name) {
diff --git a/app/src/main/java/io/xpipe/app/storage/DataStorageWriter.java b/app/src/main/java/io/xpipe/app/storage/DataStorageWriter.java
index 53244a179..18e188cff 100644
--- a/app/src/main/java/io/xpipe/app/storage/DataStorageWriter.java
+++ b/app/src/main/java/io/xpipe/app/storage/DataStorageWriter.java
@@ -64,8 +64,7 @@ private static JsonNode replaceReferencesWithIds(
 
         var value = function.apply(node).orElse(null);
         if (value != null) {
-            var idReplacement = JsonNodeFactory.instance.objectNode().set(key, new TextNode(value.toString()));
-            return idReplacement;
+            return JsonNodeFactory.instance.objectNode().set(key, new TextNode(value.toString()));
         }
 
         var replacement = JsonNodeFactory.instance.objectNode();
diff --git a/app/src/main/java/io/xpipe/app/storage/DataStoreEntry.java b/app/src/main/java/io/xpipe/app/storage/DataStoreEntry.java
index 0d53a6c48..28d664413 100644
--- a/app/src/main/java/io/xpipe/app/storage/DataStoreEntry.java
+++ b/app/src/main/java/io/xpipe/app/storage/DataStoreEntry.java
@@ -105,7 +105,7 @@ private static DataStoreEntry createExisting(
             State state,
             Configuration configuration,
             boolean expanded) {
-        var entry = new DataStoreEntry(
+        return new DataStoreEntry(
                 directory,
                 uuid,
                 name,
@@ -117,7 +117,6 @@ private static DataStoreEntry createExisting(
                 state,
                 configuration,
                 expanded);
-        return entry;
     }
 
     public static DataStoreEntry fromDirectory(Path dir) throws Exception {
@@ -263,18 +262,16 @@ public void refresh(boolean deep) throws Exception {
                     information = getProvider().queryInformationString(getStore(), 50);
                     dirty = true;
                 } else if (complete) {
-                    var stateToUse = state == State.LOAD_FAILED || state == State.INCOMPLETE
+                    state = state == State.LOAD_FAILED || state == State.INCOMPLETE
                             ? State.COMPLETE_NOT_VALIDATED
                             : state;
-                    state = stateToUse;
                     information = state == State.COMPLETE_AND_VALID
                             ? information
                             : state == State.COMPLETE_BUT_INVALID
                                     ? getProvider().queryInvalidInformationString(getStore(), 50)
                                     : null;
                 } else {
-                    var stateToUse = state == State.LOAD_FAILED ? State.COMPLETE_BUT_INVALID : State.INCOMPLETE;
-                    state = stateToUse;
+                    state = state == State.LOAD_FAILED ? State.COMPLETE_BUT_INVALID : State.INCOMPLETE;
                 }
             } catch (Exception e) {
                 validating = false;
@@ -324,10 +321,6 @@ protected boolean shouldSave() {
         return getStore() == null || getStore().shouldSave();
     }
 
-    public void addListener(Listener l) {
-        this.listeners.add(l);
-    }
-
     public void writeDataToDisk() throws Exception {
         if (!dirty) {
             return;
diff --git a/app/src/main/java/io/xpipe/app/storage/ImpersistentStorage.java b/app/src/main/java/io/xpipe/app/storage/ImpersistentStorage.java
index ca588236a..b66f5196d 100644
--- a/app/src/main/java/io/xpipe/app/storage/ImpersistentStorage.java
+++ b/app/src/main/java/io/xpipe/app/storage/ImpersistentStorage.java
@@ -31,7 +31,6 @@ public void save() {
 
     @Override
     public Path getInternalStreamPath(@NonNull UUID uuid) {
-        var newDir = FileUtils.getTempDirectory().toPath().resolve(uuid.toString());
-        return newDir;
+        return FileUtils.getTempDirectory().toPath().resolve(uuid.toString());
     }
 }
diff --git a/app/src/main/java/io/xpipe/app/storage/StandardStorage.java b/app/src/main/java/io/xpipe/app/storage/StandardStorage.java
index e41e0c41d..a9fe2ae0d 100644
--- a/app/src/main/java/io/xpipe/app/storage/StandardStorage.java
+++ b/app/src/main/java/io/xpipe/app/storage/StandardStorage.java
@@ -135,7 +135,6 @@ public synchronized void save() {
 
     @Override
     public Path getInternalStreamPath(@NonNull UUID uuid) {
-        var newDir = getStreamsDir().resolve(uuid.toString());
-        return newDir;
+        return getStreamsDir().resolve(uuid.toString());
     }
 }
diff --git a/app/src/main/java/io/xpipe/app/test/ExtensionTest.java b/app/src/main/java/io/xpipe/app/test/ExtensionTest.java
index 99a05a99b..3372047ba 100644
--- a/app/src/main/java/io/xpipe/app/test/ExtensionTest.java
+++ b/app/src/main/java/io/xpipe/app/test/ExtensionTest.java
@@ -28,8 +28,7 @@ public static Path getResourcePath(Class<?> c, String name) {
         if (url == null) {
             throw new IllegalArgumentException(String.format("File %s does not exist", name));
         }
-        var file = Path.of(url.toURI());
-        return file;
+        return Path.of(url.toURI());
     }
 
     @SneakyThrows
diff --git a/app/src/main/java/io/xpipe/app/update/AppDownloads.java b/app/src/main/java/io/xpipe/app/update/AppDownloads.java
index ab27d9fac..baf65c30e 100644
--- a/app/src/main/java/io/xpipe/app/update/AppDownloads.java
+++ b/app/src/main/java/io/xpipe/app/update/AppDownloads.java
@@ -13,7 +13,7 @@
 import org.kohsuke.github.authorization.AuthorizationProvider;
 
 import java.io.IOException;
-import java.net.URL;
+import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -53,7 +53,7 @@ public static Optional<Path> downloadInstaller(
                 return Optional.empty();
             }
 
-            var url = new URL(asset.get().getBrowserDownloadUrl());
+            var url = URI.create(asset.get().getBrowserDownloadUrl()).toURL();
             var bytes = HttpHelper.executeGet(url, aFloat -> {});
             var downloadFile =
                     FileUtils.getTempDirectory().toPath().resolve(asset.get().getName());
@@ -88,7 +88,7 @@ public static Optional<String> downloadChangelog(String version, boolean omitErr
                 return Optional.empty();
             }
 
-            var url = new URL(asset.get().getBrowserDownloadUrl());
+            var url = URI.create(asset.get().getBrowserDownloadUrl()).toURL();
             var bytes = HttpHelper.executeGet(url, aFloat -> {});
             return Optional.of(new String(bytes, StandardCharsets.UTF_8));
         } catch (Throwable t) {
diff --git a/app/src/main/java/io/xpipe/app/update/UpdateHandler.java b/app/src/main/java/io/xpipe/app/update/UpdateHandler.java
index a7f799e09..4159d4312 100644
--- a/app/src/main/java/io/xpipe/app/update/UpdateHandler.java
+++ b/app/src/main/java/io/xpipe/app/update/UpdateHandler.java
@@ -24,6 +24,7 @@
 import java.time.Duration;
 import java.time.Instant;
 
+@SuppressWarnings("InfiniteLoopStatement")
 @Getter
 public abstract class UpdateHandler {
 
diff --git a/app/src/main/java/io/xpipe/app/update/XPipeInstanceHelper.java b/app/src/main/java/io/xpipe/app/update/XPipeInstanceHelper.java
index 0aeb8e133..b0aa71de2 100644
--- a/app/src/main/java/io/xpipe/app/update/XPipeInstanceHelper.java
+++ b/app/src/main/java/io/xpipe/app/update/XPipeInstanceHelper.java
@@ -26,8 +26,7 @@ public static UUID getInstanceId() {
         }
 
         try {
-            var read = UUID.fromString(Files.readString(file));
-            return read;
+            return UUID.fromString(Files.readString(file));
         } catch (Exception e) {
             ErrorEvent.fromThrowable(e).handle();
             return UUID.randomUUID();
@@ -56,7 +55,7 @@ public static Optional<XPipeInstance> getInstance(ShellStore store) {
         //        } catch (Exception e) {
         //            return Optional.empty();
         //        }
-        return null;
+        return Optional.empty();
     }
 
     public static XPipeInstance refresh() {
diff --git a/app/src/main/java/io/xpipe/app/util/ApplicationHelper.java b/app/src/main/java/io/xpipe/app/util/ApplicationHelper.java
index cd7f7d267..f12b72ea0 100644
--- a/app/src/main/java/io/xpipe/app/util/ApplicationHelper.java
+++ b/app/src/main/java/io/xpipe/app/util/ApplicationHelper.java
@@ -17,8 +17,7 @@ public static String replaceFileArgument(String format, String variable, String
 
         var fileString = file.contains(" ") ? "\"" + file + "\"" : file;
         // Check if the variable is already quoted
-        var replaced = format.replace("\"$" + variable + "\"", fileString).replace("$" + variable, fileString);
-        return replaced;
+        return format.replace("\"$" + variable + "\"", fileString).replace("$" + variable, fileString);
     }
 
     public static void executeLocalApplication(Function<ShellControl, String> s, boolean detach) throws Exception {
diff --git a/app/src/main/java/io/xpipe/app/util/DefaultSecretValue.java b/app/src/main/java/io/xpipe/app/util/DefaultSecretValue.java
index e644ad251..4d3e59af5 100644
--- a/app/src/main/java/io/xpipe/app/util/DefaultSecretValue.java
+++ b/app/src/main/java/io/xpipe/app/util/DefaultSecretValue.java
@@ -30,7 +30,6 @@ protected SecretKey getAESKey(int keysize) throws NoSuchAlgorithmException, Inva
         var salt = new byte[16];
         new Random(keysize).nextBytes(salt);
         KeySpec spec = new PBEKeySpec(new char[] {'X', 'P', 'E' << 1}, salt, 2048, keysize);
-        SecretKey secret = new SecretKeySpec(factory.generateSecret(spec).getEncoded(), "AES");
-        return secret;
+        return new SecretKeySpec(factory.generateSecret(spec).getEncoded(), "AES");
     }
 }
diff --git a/app/src/main/java/io/xpipe/app/util/HttpHelper.java b/app/src/main/java/io/xpipe/app/util/HttpHelper.java
index 8fc0af671..c0172d75a 100644
--- a/app/src/main/java/io/xpipe/app/util/HttpHelper.java
+++ b/app/src/main/java/io/xpipe/app/util/HttpHelper.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
+import java.net.URI;
 import java.net.URL;
 import java.nio.ByteBuffer;
 import java.nio.file.Files;
@@ -12,7 +13,7 @@
 public class HttpHelper {
 
     public static Path downloadFile(String urlS) throws Exception {
-        var url = new URL(urlS);
+        var url = URI.create(urlS).toURL();
         var bytes = HttpHelper.executeGet(url, aFloat -> {});
         var downloadFile = Files.createTempFile(null, null);
         Files.write(downloadFile, bytes);
diff --git a/app/src/main/java/io/xpipe/app/util/LockedSecretValue.java b/app/src/main/java/io/xpipe/app/util/LockedSecretValue.java
index 792a134df..2575fd752 100644
--- a/app/src/main/java/io/xpipe/app/util/LockedSecretValue.java
+++ b/app/src/main/java/io/xpipe/app/util/LockedSecretValue.java
@@ -39,7 +39,6 @@ protected SecretKey getAESKey(int keysize) throws NoSuchAlgorithmException, Inva
         var salt = new byte[16];
         new Random(keysize).nextBytes(salt);
         KeySpec spec = new PBEKeySpec(chars, salt, 8192, keysize);
-        SecretKey secret = new SecretKeySpec(factory.generateSecret(spec).getEncoded(), "AES");
-        return secret;
+        return new SecretKeySpec(factory.generateSecret(spec).getEncoded(), "AES");
     }
 }
diff --git a/app/src/main/java/io/xpipe/app/util/ProxyManagerProviderImpl.java b/app/src/main/java/io/xpipe/app/util/ProxyManagerProviderImpl.java
index 574a640ad..1b30b2bd0 100644
--- a/app/src/main/java/io/xpipe/app/util/ProxyManagerProviderImpl.java
+++ b/app/src/main/java/io/xpipe/app/util/ProxyManagerProviderImpl.java
@@ -18,7 +18,7 @@
 public class ProxyManagerProviderImpl extends ProxyManagerProvider {
 
     private static boolean showAlert() {
-        var okay = AppWindowHelper.showBlockingAlert(alert -> {
+        return AppWindowHelper.showBlockingAlert(alert -> {
                     alert.setAlertType(Alert.AlertType.CONFIRMATION);
                     alert.setTitle(AppI18n.get("connectorInstallationTitle"));
                     alert.setHeaderText(AppI18n.get("connectorInstallationHeader"));
@@ -27,7 +27,6 @@ private static boolean showAlert() {
                 })
                 .filter(buttonType -> buttonType.getButtonData().isDefaultButton())
                 .isPresent();
-        return okay;
     }
 
     @Override
diff --git a/app/src/main/java/io/xpipe/app/util/ScanAlert.java b/app/src/main/java/io/xpipe/app/util/ScanAlert.java
index ce4777d30..8f6e28ba3 100644
--- a/app/src/main/java/io/xpipe/app/util/ScanAlert.java
+++ b/app/src/main/java/io/xpipe/app/util/ScanAlert.java
@@ -42,11 +42,10 @@ public static void showAsync(DataStoreEntry entry) {
     private static void showForOtherStore(DataStoreEntry entry) {
         show(entry, () -> {
             var providers = ScanProvider.getAll();
-            var applicable = providers.stream()
+            return providers.stream()
                     .map(scanProvider -> scanProvider.create(entry.getStore()))
                     .filter(scanOperation -> scanOperation != null)
                     .toList();
-            return applicable;
         });
     }
 
diff --git a/app/src/main/java/io/xpipe/app/util/ScriptHelper.java b/app/src/main/java/io/xpipe/app/util/ScriptHelper.java
index 2cb1bc8db..2813309f6 100644
--- a/app/src/main/java/io/xpipe/app/util/ScriptHelper.java
+++ b/app/src/main/java/io/xpipe/app/util/ScriptHelper.java
@@ -76,8 +76,7 @@ public static String constructInitFile(ShellDialect t, ShellControl processContr
             content += t.getExitCommand() + nl;
         }
 
-        var initFile = createExecScript(t, processControl, t.initFileName(processControl), content);
-        return initFile;
+        return createExecScript(t, processControl, t.initFileName(processControl), content);
     }
 
     @SneakyThrows
@@ -90,8 +89,7 @@ public static String getExecScriptFile(ShellControl processControl) {
     public static String getExecScriptFile(ShellControl processControl, String fileEnding) {
         var fileName = "exec-" + getScriptId();
         var temp = processControl.getSubTemporaryDirectory();
-        var file = FileNames.join(temp, fileName + "." + fileEnding);
-        return file;
+        return FileNames.join(temp, fileName + "." + fileEnding);
     }
 
     @SneakyThrows
@@ -154,8 +152,7 @@ private static String createAskPassScript(List<SecretValue> pass, ShellControl p
                                 pass.stream()
                                         .map(secretValue -> secretValue.getSecretValue())
                                         .toList());
-                var exec = createExecScript(sub.getShellDialect(), sub, file, content);
-                return exec;
+                return createExecScript(sub.getShellDialect(), sub, file, content);
             }
         } else {
             var content = parent.getShellDialect()
@@ -165,8 +162,7 @@ private static String createAskPassScript(List<SecretValue> pass, ShellControl p
                             pass.stream()
                                     .map(secretValue -> secretValue.getSecretValue())
                                     .toList());
-            var exec = createExecScript(parent.getShellDialect(), parent, file, content);
-            return exec;
+            return createExecScript(parent.getShellDialect(), parent, file, content);
         }
     }
 }
diff --git a/app/src/main/java/io/xpipe/app/util/SecretRetrievalStrategy.java b/app/src/main/java/io/xpipe/app/util/SecretRetrievalStrategy.java
index 58d12828a..688279473 100644
--- a/app/src/main/java/io/xpipe/app/util/SecretRetrievalStrategy.java
+++ b/app/src/main/java/io/xpipe/app/util/SecretRetrievalStrategy.java
@@ -33,7 +33,7 @@ public interface SecretRetrievalStrategy {
     boolean shouldCache();
 
     @JsonTypeName("none")
-    public static class None implements SecretRetrievalStrategy {
+    class None implements SecretRetrievalStrategy {
 
         @Override
         public SecretValue retrieve(String displayName, UUID id, int sub) {
@@ -52,7 +52,7 @@ public boolean shouldCache() {
     }
 
     @JsonTypeName("reference")
-    public static class Reference implements SecretRetrievalStrategy {
+    class Reference implements SecretRetrievalStrategy {
 
         @JsonIgnore
         private final Supplier<SecretValue> supplier;
@@ -82,7 +82,7 @@ public boolean shouldCache() {
     @Builder
     @Value
     @Jacksonized
-    public static class InPlace implements SecretRetrievalStrategy {
+    class InPlace implements SecretRetrievalStrategy {
 
         SecretValue value;
 
@@ -106,7 +106,7 @@ public boolean isLocalAskpassCompatible() {
     }
 
     @JsonTypeName("prompt")
-    public static class Prompt implements SecretRetrievalStrategy {
+    class Prompt implements SecretRetrievalStrategy {
 
         @Override
         public SecretValue retrieve(String displayName, UUID id, int sub) {
@@ -127,7 +127,7 @@ public boolean isLocalAskpassCompatible() {
     @Builder
     @Jacksonized
     @Value
-    public static class PasswordManager implements SecretRetrievalStrategy {
+    class PasswordManager implements SecretRetrievalStrategy {
 
         String key;
 
@@ -158,7 +158,7 @@ public boolean isLocalAskpassCompatible() {
     @Builder
     @Jacksonized
     @Value
-    public static class CustomCommand implements SecretRetrievalStrategy {
+    class CustomCommand implements SecretRetrievalStrategy {
 
         String command;
 
diff --git a/app/src/main/java/io/xpipe/app/util/SecretRetrievalStrategyHelper.java b/app/src/main/java/io/xpipe/app/util/SecretRetrievalStrategyHelper.java
index 2431297ab..700bc15b0 100644
--- a/app/src/main/java/io/xpipe/app/util/SecretRetrievalStrategyHelper.java
+++ b/app/src/main/java/io/xpipe/app/util/SecretRetrievalStrategyHelper.java
@@ -2,7 +2,6 @@
 
 import io.xpipe.app.comp.base.ButtonComp;
 import io.xpipe.app.core.App;
-import io.xpipe.app.fxcomps.Comp;
 import io.xpipe.app.fxcomps.impl.HorizontalComp;
 import io.xpipe.app.fxcomps.impl.SecretFieldComp;
 import io.xpipe.app.fxcomps.impl.TextFieldComp;
@@ -32,7 +31,7 @@ private static OptionsBuilder inPlace(Property<SecretRetrievalStrategy.InPlace>
     private static OptionsBuilder passwordManager(Property<SecretRetrievalStrategy.PasswordManager> p) {
         var keyProperty =
                 new SimpleObjectProperty<>(p.getValue() != null ? p.getValue().getKey() : null);
-        var content = new HorizontalComp(List.<Comp<?>>of(
+        var content = new HorizontalComp(List.of(
                         new TextFieldComp(keyProperty).apply(struc -> struc.get().setPromptText("Password key")).hgrow(),
                         new ButtonComp(null, new FontIcon("mdomz-settings"), () -> {
                                     AppPrefs.get().selectCategory(3);
diff --git a/beacon/src/main/java/io/xpipe/beacon/BeaconServer.java b/beacon/src/main/java/io/xpipe/beacon/BeaconServer.java
index e83b8c6fa..0404b487b 100644
--- a/beacon/src/main/java/io/xpipe/beacon/BeaconServer.java
+++ b/beacon/src/main/java/io/xpipe/beacon/BeaconServer.java
@@ -25,9 +25,7 @@ public static boolean isRunning() {
     }
 
     private static List<String> toProcessCommand(String toExec) {
-        var command =
-                OsType.getLocal().equals(OsType.WINDOWS) ? List.of("cmd", "/c", toExec) : List.of("sh", "-c", toExec);
-        return command;
+        return OsType.getLocal().equals(OsType.WINDOWS) ? List.of("cmd", "/c", toExec) : List.of("sh", "-c", toExec);
     }
 
     public static Process tryStartCustom() throws Exception {
diff --git a/beacon/src/main/java/io/xpipe/beacon/SecretProviderImpl.java b/beacon/src/main/java/io/xpipe/beacon/SecretProviderImpl.java
index ed442f9a2..ecab8b140 100644
--- a/beacon/src/main/java/io/xpipe/beacon/SecretProviderImpl.java
+++ b/beacon/src/main/java/io/xpipe/beacon/SecretProviderImpl.java
@@ -36,8 +36,7 @@ private static SecretKey getAESKey(int keysize) throws NoSuchAlgorithmException,
         var salt = new byte[16];
         new Random(keysize).nextBytes(salt);
         KeySpec spec = new PBEKeySpec(new char[] {'X', 'P', 'E' << 1}, salt, 65536, keysize);
-        SecretKey secret = new SecretKeySpec(factory.generateSecret(spec).getEncoded(), "AES");
-        return secret;
+        return new SecretKeySpec(factory.generateSecret(spec).getEncoded(), "AES");
     }
 
     @Override
diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/MessageExchange.java b/beacon/src/main/java/io/xpipe/beacon/exchange/MessageExchange.java
index 9a26f6f97..999cd7057 100644
--- a/beacon/src/main/java/io/xpipe/beacon/exchange/MessageExchange.java
+++ b/beacon/src/main/java/io/xpipe/beacon/exchange/MessageExchange.java
@@ -16,7 +16,6 @@ public interface MessageExchange {
      * Returns the request class, needed for serialization.
      */
     @SneakyThrows
-    @SuppressWarnings("unchecked")
     default Class<?> getRequestClass() {
         var c = getClass().getSuperclass();
         var name = (MessageExchange.class.isAssignableFrom(c) ? c : getClass()).getName() + "$Request";
@@ -27,7 +26,6 @@ default Class<?> getRequestClass() {
      * Returns the response class, needed for serialization.
      */
     @SneakyThrows
-    @SuppressWarnings("unchecked")
     default Class<?> getResponseClass() {
         var c = getClass().getSuperclass();
         var name = (MessageExchange.class.isAssignableFrom(c) ? c : getClass()).getName() + "$Response";
diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/MessageExchanges.java b/beacon/src/main/java/io/xpipe/beacon/exchange/MessageExchanges.java
index b235cfa65..157809ea6 100644
--- a/beacon/src/main/java/io/xpipe/beacon/exchange/MessageExchanges.java
+++ b/beacon/src/main/java/io/xpipe/beacon/exchange/MessageExchanges.java
@@ -16,8 +16,7 @@ public static void loadAll() {
         if (ALL == null) {
             ALL = ServiceLoader.load(MessageExchange.class).stream()
                     .map(s -> {
-                        var ex = (MessageExchange) s.get();
-                        return ex;
+                        return (MessageExchange) s.get();
                     })
                     .collect(Collectors.toList());
         }
diff --git a/core/src/main/java/io/xpipe/core/charsetter/Charsetter.java b/core/src/main/java/io/xpipe/core/charsetter/Charsetter.java
index eb5726f4c..7e5844b74 100644
--- a/core/src/main/java/io/xpipe/core/charsetter/Charsetter.java
+++ b/core/src/main/java/io/xpipe/core/charsetter/Charsetter.java
@@ -61,8 +61,7 @@ public BufferedReader reader(StreamDataStore store, StreamCharset charset) throw
     }
 
     public OutputStreamWriter writer(StreamDataStore store, StreamCharset charset) throws Exception {
-        var out = new OutputStreamWriter(store.openOutput(), charset.getCharset());
-        return out;
+        return new OutputStreamWriter(store.openOutput(), charset.getCharset());
     }
 
     public BufferedReader reader(InputStream stream, StreamCharset charset) throws Exception {
diff --git a/core/src/main/java/io/xpipe/core/data/node/ArrayNode.java b/core/src/main/java/io/xpipe/core/data/node/ArrayNode.java
index 3bcef8ae8..4c72be15a 100644
--- a/core/src/main/java/io/xpipe/core/data/node/ArrayNode.java
+++ b/core/src/main/java/io/xpipe/core/data/node/ArrayNode.java
@@ -35,6 +35,7 @@ public boolean equals(Object o) {
                 getNodes().equals(that.getNodes()) && Objects.equals(getMetaAttributes(), that.getMetaAttributes());
 
         // Useful for debugging
+        //noinspection PointlessBooleanExpression
         if (toReturn == false) {
             return false;
         }
diff --git a/core/src/main/java/io/xpipe/core/data/node/DataStructureNodeIO.java b/core/src/main/java/io/xpipe/core/data/node/DataStructureNodeIO.java
index b9281c7e0..1c2e7f502 100644
--- a/core/src/main/java/io/xpipe/core/data/node/DataStructureNodeIO.java
+++ b/core/src/main/java/io/xpipe/core/data/node/DataStructureNodeIO.java
@@ -61,8 +61,7 @@ public static String parseString(InputStream in) throws IOException {
             return null;
         }
 
-        var name = new String(in.readNBytes(nameLength), StandardCharsets.UTF_8);
-        return name;
+        return new String(in.readNBytes(nameLength), StandardCharsets.UTF_8);
     }
 
     public static Map<Integer, String> parseAttributes(InputStream in) throws IOException {
diff --git a/core/src/main/java/io/xpipe/core/data/node/TupleNode.java b/core/src/main/java/io/xpipe/core/data/node/TupleNode.java
index d958015c6..61caaa5e7 100644
--- a/core/src/main/java/io/xpipe/core/data/node/TupleNode.java
+++ b/core/src/main/java/io/xpipe/core/data/node/TupleNode.java
@@ -85,6 +85,7 @@ && getNodes().equals(that.getNodes())
                 && Objects.equals(getMetaAttributes(), that.getMetaAttributes());
 
         // Useful for debugging
+        //noinspection PointlessBooleanExpression
         if (toReturn == false) {
             return false;
         }
diff --git a/core/src/main/java/io/xpipe/core/data/node/ValueNode.java b/core/src/main/java/io/xpipe/core/data/node/ValueNode.java
index cfbaa2cda..1410c9cb4 100644
--- a/core/src/main/java/io/xpipe/core/data/node/ValueNode.java
+++ b/core/src/main/java/io/xpipe/core/data/node/ValueNode.java
@@ -140,6 +140,7 @@ public boolean equals(Object o) {
                 && Objects.equals(getMetaAttributes(), that.getMetaAttributes());
 
         // Useful for debugging
+        //noinspection PointlessBooleanExpression
         if (toReturn == false) {
             return false;
         }
diff --git a/core/src/main/java/io/xpipe/core/dialog/Dialog.java b/core/src/main/java/io/xpipe/core/dialog/Dialog.java
index c2d9f950f..b84df98bb 100644
--- a/core/src/main/java/io/xpipe/core/dialog/Dialog.java
+++ b/core/src/main/java/io/xpipe/core/dialog/Dialog.java
@@ -374,8 +374,7 @@ public DialogElement start() {
             @Override
             protected DialogElement next(String answer) throws Exception {
                 if (choiceMade != null) {
-                    var r = choiceMade.receive(answer);
-                    return r;
+                    return choiceMade.receive(answer);
                 }
 
                 if (choice.apply(answer)) {
diff --git a/core/src/main/java/io/xpipe/core/dialog/DialogReference.java b/core/src/main/java/io/xpipe/core/dialog/DialogReference.java
index a63ab0495..29c763a7d 100644
--- a/core/src/main/java/io/xpipe/core/dialog/DialogReference.java
+++ b/core/src/main/java/io/xpipe/core/dialog/DialogReference.java
@@ -18,7 +18,7 @@ public class DialogReference {
     DialogElement start;
 
     @JsonCreator
-    public DialogReference(UUID dialogId, DialogElement start) {
+    public DialogReference(@NonNull UUID dialogId, DialogElement start) {
         this.dialogId = dialogId;
         this.start = start;
     }
diff --git a/core/src/main/java/io/xpipe/core/impl/InternalStreamStore.java b/core/src/main/java/io/xpipe/core/impl/InternalStreamStore.java
index 2bf7bb7a3..dac595547 100644
--- a/core/src/main/java/io/xpipe/core/impl/InternalStreamStore.java
+++ b/core/src/main/java/io/xpipe/core/impl/InternalStreamStore.java
@@ -27,11 +27,6 @@ public InternalStreamStore() {
         this.uuid = UUID.randomUUID();
     }
 
-    @Override
-    public DataFlow getFlow() {
-        return DataFlow.INPUT_OUTPUT;
-    }
-
     private Path getFile() {
         return DataStateProvider.get().getInternalStreamStore(uuid);
     }
diff --git a/core/src/main/java/io/xpipe/core/impl/PeekTableStreamReadConnection.java b/core/src/main/java/io/xpipe/core/impl/PeekTableStreamReadConnection.java
index 17143ce85..2d39d878a 100644
--- a/core/src/main/java/io/xpipe/core/impl/PeekTableStreamReadConnection.java
+++ b/core/src/main/java/io/xpipe/core/impl/PeekTableStreamReadConnection.java
@@ -38,15 +38,6 @@ protected TupleType convertType(TupleNode n) {
         return n.determineDataType().asTuple();
     }
 
-    @Override
-    public void close() throws Exception {
-        if (inputStream == null) {
-            throw new IllegalStateException("Not initialized");
-        }
-
-        inputStream.close();
-    }
-
     @Override
     public TupleType getDataType() {
         return type;
diff --git a/core/src/main/java/io/xpipe/core/process/CommandBuilder.java b/core/src/main/java/io/xpipe/core/process/CommandBuilder.java
index 98044f5c9..850defd9b 100644
--- a/core/src/main/java/io/xpipe/core/process/CommandBuilder.java
+++ b/core/src/main/java/io/xpipe/core/process/CommandBuilder.java
@@ -16,7 +16,7 @@ private CommandBuilder() {}
 
     private final List<Element> elements = new ArrayList<>();
 
-    public static interface Element {
+    public interface Element {
 
         String evaluate(ShellControl sc) throws Exception;
     }
diff --git a/core/src/main/java/io/xpipe/core/process/ShellControl.java b/core/src/main/java/io/xpipe/core/process/ShellControl.java
index dc4aa65c1..b56cef1da 100644
--- a/core/src/main/java/io/xpipe/core/process/ShellControl.java
+++ b/core/src/main/java/io/xpipe/core/process/ShellControl.java
@@ -116,13 +116,7 @@ default ShellControl elevationPassword(SecretValue value) {
     FailableSupplier<SecretValue> getElevationPassword();
 
     default ShellControl subShell(@NonNull ShellDialect type) {
-        return subShell(p -> type.getOpenCommand(), new TerminalOpenFunction() {
-
-            @Override
-                    public String prepare(ShellControl sc, String command) {
-                        return command;
-                    }
-                })
+        return subShell(p -> type.getOpenCommand(), (sc, command) -> command)
                 .elevationPassword(getElevationPassword());
     }
 
@@ -132,24 +126,12 @@ interface TerminalOpenFunction {
     }
 
     default ShellControl identicalSubShell() {
-        return subShell(p -> p.getShellDialect().getOpenCommand(), new TerminalOpenFunction() {
-
-            @Override
-                    public String prepare(ShellControl sc, String command) {
-                        return command;
-                    }
-                })
+        return subShell(p -> p.getShellDialect().getOpenCommand(), (sc, command) -> command)
                 .elevationPassword(getElevationPassword());
     }
 
     default ShellControl subShell(@NonNull String command) {
-        return subShell(processControl -> command, new TerminalOpenFunction() {
-
-            @Override
-            public String prepare(ShellControl sc, String command) {
-                return command;
-            }
-        });
+        return subShell(processControl -> command, (sc, command1) -> command1);
     }
 
     default ShellControl enforcedDialect(ShellDialect type) throws Exception {
@@ -179,7 +161,7 @@ ShellControl subShell(
     void cd(String directory) throws Exception;
 
     @Override
-    ShellControl start() throws Exception;
+    ShellControl start();
 
     CommandControl command(FailableFunction<ShellControl, String, Exception> command);
 
diff --git a/core/src/main/java/io/xpipe/core/util/SecretValue.java b/core/src/main/java/io/xpipe/core/util/SecretValue.java
index 94c80fe2c..70004403a 100644
--- a/core/src/main/java/io/xpipe/core/util/SecretValue.java
+++ b/core/src/main/java/io/xpipe/core/util/SecretValue.java
@@ -15,8 +15,7 @@ static String toBase64e(byte[] b) {
     }
 
     static byte[] fromBase64e(String s) {
-        var bytes = Base64.getDecoder().decode(s.replace("-", "/"));
-        return bytes;
+        return Base64.getDecoder().decode(s.replace("-", "/"));
     }
 
     default void withSecretValue(Consumer<char[]> con) {
diff --git a/core/src/main/java/io/xpipe/core/util/XPipeInstallation.java b/core/src/main/java/io/xpipe/core/util/XPipeInstallation.java
index 46922dce1..f9e908be3 100644
--- a/core/src/main/java/io/xpipe/core/util/XPipeInstallation.java
+++ b/core/src/main/java/io/xpipe/core/util/XPipeInstallation.java
@@ -164,8 +164,7 @@ public static String queryInstallationVersion(ShellControl p, String exec) throw
 
     public static String getInstallationExecutable(ShellControl p, String installation) {
         var executable = getDaemonExecutablePath(p.getOsType());
-        var file = FileNames.join(installation, executable);
-        return file;
+        return FileNames.join(installation, executable);
     }
 
     public static String getDataBasePath(ShellControl p) throws Exception {
diff --git a/ext/base/src/main/java/io/xpipe/ext/base/HttpStore.java b/ext/base/src/main/java/io/xpipe/ext/base/HttpStore.java
index 39c70d371..2acb3c2da 100644
--- a/ext/base/src/main/java/io/xpipe/ext/base/HttpStore.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/HttpStore.java
@@ -109,17 +109,15 @@ public void validate() throws Exception {
     }
 
     private HttpClient createClient() {
-        var client = HttpClient.newBuilder()
+        return HttpClient.newBuilder()
                 .followRedirects(HttpClient.Redirect.ALWAYS)
                 .build();
-        return client;
     }
 
     private HttpRequest createRequest() {
         var b = HttpRequest.newBuilder().uri(getURL());
         headers.forEach(b::setHeader);
-        var req = b.GET().build();
-        return req;
+        return b.GET().build();
     }
 
     @Override
diff --git a/ext/base/src/main/java/io/xpipe/ext/base/InternalStreamProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/InternalStreamProvider.java
index b229c3483..c6c9cef62 100644
--- a/ext/base/src/main/java/io/xpipe/ext/base/InternalStreamProvider.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/InternalStreamProvider.java
@@ -15,21 +15,11 @@ public boolean canManuallyCreate() {
         return false;
     }
 
-    @Override
-    public GuiDialog guiDialog(Property<DataStore> store) {
-        return null;
-    }
-
     @Override
     public String queryInformationString(DataStore store, int length) {
         return getDisplayName();
     }
 
-    @Override
-    public String toSummaryString(DataStore store, int length) {
-        return null;
-    }
-
     @Override
     public DataStore defaultStore() {
         return new InternalStreamStore();
diff --git a/ext/base/src/main/java/io/xpipe/ext/base/SimpleFileDataSourceProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/SimpleFileDataSourceProvider.java
index 68e585a06..44fa3e23c 100644
--- a/ext/base/src/main/java/io/xpipe/ext/base/SimpleFileDataSourceProvider.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/SimpleFileDataSourceProvider.java
@@ -82,8 +82,7 @@ public String getFileName() {
 
             @Override
             public Map<String, List<String>> getFileExtensions() {
-                var map = new LinkedHashMap<>(getSupportedExtensions());
-                return map;
+                return new LinkedHashMap<>(getSupportedExtensions());
             }
         };
     }
diff --git a/ext/base/src/main/java/io/xpipe/ext/base/action/DeleteStoreChildrenAction.java b/ext/base/src/main/java/io/xpipe/ext/base/action/DeleteStoreChildrenAction.java
index d22918579..899d4b944 100644
--- a/ext/base/src/main/java/io/xpipe/ext/base/action/DeleteStoreChildrenAction.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/action/DeleteStoreChildrenAction.java
@@ -31,11 +31,6 @@ public void execute() {
     public DataStoreCallSite<?> getDataStoreCallSite() {
         return new DataStoreCallSite<>() {
 
-            @Override
-            public boolean isMajor(DataStore o) {
-                return false;
-            }
-
             @Override
             public ActionProvider.Action createAction(DataStore store) {
                 return new Action(DataStorage.get().getStoreEntry(store));
diff --git a/ext/base/src/main/java/io/xpipe/ext/base/action/LaunchShortcutAction.java b/ext/base/src/main/java/io/xpipe/ext/base/action/LaunchShortcutAction.java
index 046b27797..360f551b9 100644
--- a/ext/base/src/main/java/io/xpipe/ext/base/action/LaunchShortcutAction.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/action/LaunchShortcutAction.java
@@ -51,10 +51,6 @@ public String getIcon(LaunchableStore store) {
                 return "mdi2c-code-greater-than";
             }
 
-            @Override
-            public boolean isMajor(LaunchableStore o) {
-                return false;
-            }
         };
     }
 }
diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/BackAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/BackAction.java
index ba3fbcd93..cc6a1457a 100644
--- a/ext/base/src/main/java/io/xpipe/ext/base/browser/BackAction.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/BackAction.java
@@ -22,11 +22,6 @@ public void execute(OpenFileSystemModel model, List<BrowserEntry> entries) throw
         model.backSync();
     }
 
-    @Override
-    public Category getCategory() {
-        return null;
-    }
-
     @Override
     public Node getIcon(OpenFileSystemModel model, List<BrowserEntry> entries) {
         return new FontIcon("fth-arrow-left");
diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/CopyPathAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/CopyPathAction.java
index 1950f9c5d..ecde59cbd 100644
--- a/ext/base/src/main/java/io/xpipe/ext/base/browser/CopyPathAction.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/CopyPathAction.java
@@ -50,11 +50,6 @@ public String getName(OpenFileSystemModel model, List<BrowserEntry> entries) {
                         return "Absolute Path";
                     }
 
-                    @Override
-                    public boolean automaticallyResolveLinks() {
-                        return true;
-                    }
-
                     @Override
                     public KeyCombination getShortcut() {
                         return new KeyCodeCombination(KeyCode.C, KeyCombination.ALT_DOWN, KeyCombination.SHORTCUT_DOWN);
diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/ForwardAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/ForwardAction.java
index a013a1959..a3946f418 100644
--- a/ext/base/src/main/java/io/xpipe/ext/base/browser/ForwardAction.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/ForwardAction.java
@@ -22,11 +22,6 @@ public void execute(OpenFileSystemModel model, List<BrowserEntry> entries) throw
         model.forthSync();
     }
 
-    @Override
-    public Category getCategory() {
-        return null;
-    }
-
     @Override
     public Node getIcon(OpenFileSystemModel model, List<BrowserEntry> entries) {
         return new FontIcon("fth-arrow-right");
diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/RefreshDirectoryAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/RefreshDirectoryAction.java
index bbf0753e6..2575a1e34 100644
--- a/ext/base/src/main/java/io/xpipe/ext/base/browser/RefreshDirectoryAction.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/RefreshDirectoryAction.java
@@ -23,11 +23,6 @@ public void execute(OpenFileSystemModel model, List<BrowserEntry> entries) throw
         model.refreshSync();
     }
 
-    @Override
-    public BrowserAction.Category getCategory() {
-        return null;
-    }
-
     @Override
     public boolean isActive(OpenFileSystemModel model, List<BrowserEntry> entries) {
         return !model.getInOverview().get();
diff --git a/ext/csv/src/main/java/io/xpipe/ext/csv/CsvReadConnection.java b/ext/csv/src/main/java/io/xpipe/ext/csv/CsvReadConnection.java
index 7ccf5ee4b..0e4430484 100644
--- a/ext/csv/src/main/java/io/xpipe/ext/csv/CsvReadConnection.java
+++ b/ext/csv/src/main/java/io/xpipe/ext/csv/CsvReadConnection.java
@@ -57,8 +57,7 @@ public void withRows(DataStructureNodeAcceptor<TupleNode> lineAcceptor) throws E
                             return ValueNode.nullValue();
                         }
                         var quotesRemoved = CsvQuoteChar.strip(s, source.getQuote());
-                        var value = ValueNode.of(quotesRemoved);
-                        return value;
+                        return ValueNode.of(quotesRemoved);
                     })
                     .toList();
 
diff --git a/ext/csv/src/main/java/io/xpipe/ext/csv/CsvWriteConnection.java b/ext/csv/src/main/java/io/xpipe/ext/csv/CsvWriteConnection.java
index 99ede9c09..1cc03410f 100644
--- a/ext/csv/src/main/java/io/xpipe/ext/csv/CsvWriteConnection.java
+++ b/ext/csv/src/main/java/io/xpipe/ext/csv/CsvWriteConnection.java
@@ -58,13 +58,12 @@ public void detect() throws Exception {
         var array = CsvSplitter.splitRaw(lines, source.getQuote(), source.getDelimiter());
         var headerState = CsvHeaderState.determine(array, source.getQuote());
         var quoteStates = CsvQuoteState.determine(array, headerState, source.getQuote());
-        var rawHeader = headerState == CsvHeaderState.INCLUDED
+
+        this.rawColumnNames = headerState == CsvHeaderState.INCLUDED
                 ? array.at(0).getNodes().stream()
                         .map(DataStructureNode::asString)
                         .toList()
                 : null;
-
-        this.rawColumnNames = rawHeader;
         this.quoteStates = quoteStates;
     }
 
diff --git a/ext/pdx/src/main/java/io/xpipe/ext/pdx/PdxFileProvider.java b/ext/pdx/src/main/java/io/xpipe/ext/pdx/PdxFileProvider.java
index 751cbcbb4..0f6b10cc5 100644
--- a/ext/pdx/src/main/java/io/xpipe/ext/pdx/PdxFileProvider.java
+++ b/ext/pdx/src/main/java/io/xpipe/ext/pdx/PdxFileProvider.java
@@ -28,10 +28,9 @@ public boolean supportsConversion(T desc, DataSourceType t) {
     @Override
     public DataSource<?> convert(T in, DataSourceType t) throws Exception {
         Source d = in.asNeeded();
-        CollectionDataSource<?> ds = DataSourceProviders.byId("zip")
+        return DataSourceProviders.byId("zip")
                 .createDefaultSource(in.getStore())
                 .asNeeded();
-        return ds;
     }
 
     @Override
diff --git a/ext/pdx/src/main/java/io/xpipe/ext/pdx/PdxTextFileProvider.java b/ext/pdx/src/main/java/io/xpipe/ext/pdx/PdxTextFileProvider.java
index a5b997e36..e86bf0539 100644
--- a/ext/pdx/src/main/java/io/xpipe/ext/pdx/PdxTextFileProvider.java
+++ b/ext/pdx/src/main/java/io/xpipe/ext/pdx/PdxTextFileProvider.java
@@ -85,8 +85,7 @@ public boolean canRead() throws Exception {
                 public DataStructureNode read() throws Exception {
                     try (var in = store.openInput()) {
                         var bytes = in.readAllBytes();
-                        var node = TextFormatParser.text().parse(store.toString(), bytes, 0, false);
-                        return node;
+                        return TextFormatParser.text().parse(store.toString(), bytes, 0, false);
                     }
                 }
             };
diff --git a/ext/pdx/src/main/java/io/xpipe/ext/pdx/parser/TextFormatParser.java b/ext/pdx/src/main/java/io/xpipe/ext/pdx/parser/TextFormatParser.java
index 85e14c28a..567b20dde 100644
--- a/ext/pdx/src/main/java/io/xpipe/ext/pdx/parser/TextFormatParser.java
+++ b/ext/pdx/src/main/java/io/xpipe/ext/pdx/parser/TextFormatParser.java
@@ -114,10 +114,9 @@ public synchronized TupleNode parse(String name, byte[] input, int start, boolea
                     tokenizer.getScalarCount());
 
             // now = Instant.now();
-            TupleNode r = parseArray(name, strict);
             // System.out.println("Node creator took " + ChronoUnit.MILLIS.between(now, Instant.now()) + "ms");
 
-            return r;
+            return parseArray(name, strict);
         } catch (ParseException ex) {
             throw ex;
         } catch (Throwable t) {