diff --git a/src/main/java/core/gui/comp/table/FixedColumnsTable.java b/src/main/java/core/gui/comp/table/FixedColumnsTable.java
index d875e460d..599d93f56 100644
--- a/src/main/java/core/gui/comp/table/FixedColumnsTable.java
+++ b/src/main/java/core/gui/comp/table/FixedColumnsTable.java
@@ -2,12 +2,10 @@
 
 import core.gui.comp.renderer.HODefaultTableCellRenderer;
 import core.model.HOConfigurationIntParameter;
-
 import javax.swing.*;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableModel;
-import javax.swing.table.TableRowSorter;
 import java.awt.*;
 
 public class FixedColumnsTable extends JTable {
@@ -20,22 +18,12 @@ public class FixedColumnsTable extends JTable {
 
     private final HOConfigurationIntParameter dividerLocation;
 
-    /**
-     * Table sorter
-     */
-//    private final TableRowSorter<HOTableModel> tableRowSorter;
-
     /**
      * Fixed table part (left hand side)
      */
     private final JTable fixed;
     private final JScrollPane scrollPane;
 
-    /**
-     * Scrollable table part (right hand side)
-     */
-//    private final JTable scroll;
-
 
     public FixedColumnsTable(HOTableModel tableModel) {
         this(tableModel, 1);
diff --git a/src/main/java/core/gui/comp/table/HOTableModel.java b/src/main/java/core/gui/comp/table/HOTableModel.java
index d2b9fe169..3db1c4a01 100644
--- a/src/main/java/core/gui/comp/table/HOTableModel.java
+++ b/src/main/java/core/gui/comp/table/HOTableModel.java
@@ -48,7 +48,9 @@ public abstract class HOTableModel extends AbstractTableModel {
 //	protected int instance;
 
 	public TableRowSorter<HOTableModel> getRowSorter() {
-		if ( table != null) return (TableRowSorter<HOTableModel>) table.getRowSorter();
+		if ( table != null) {
+            return (TableRowSorter<HOTableModel>) table.getRowSorter();
+        }
 		return null;
 	}
 
diff --git a/src/main/java/core/gui/model/PlayerAnalysisModel.java b/src/main/java/core/gui/model/PlayerAnalysisModel.java
index 0e9b84918..1cef63960 100644
--- a/src/main/java/core/gui/model/PlayerAnalysisModel.java
+++ b/src/main/java/core/gui/model/PlayerAnalysisModel.java
@@ -3,7 +3,6 @@
 import core.db.DBManager;
 import core.gui.comp.table.HOTableModel;
 import core.gui.comp.table.UserColumn;
-import core.model.TranslationFacility;
 import core.model.enums.MatchType;
 import core.model.match.Matchdetails;
 import core.model.player.Player;
diff --git a/src/main/java/module/playerOverview/PlayerOverviewTable.java b/src/main/java/module/playerOverview/PlayerOverviewTable.java
index 653e2d84a..226e735cf 100644
--- a/src/main/java/module/playerOverview/PlayerOverviewTable.java
+++ b/src/main/java/module/playerOverview/PlayerOverviewTable.java
@@ -14,6 +14,7 @@
 import core.model.match.MatchKurzInfo;
 import core.model.player.Player;
 import core.net.HattrickLink;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.*;
@@ -81,7 +82,7 @@ public void mouseReleased(MouseEvent e) {
 		});
 	}
 
-	public int columnAtPoint(Point point) {
+	public int columnAtPoint(@NotNull Point point) {
 		var ret = super.columnAtPoint(point);
 		if (ret > -1){
 			return ret + getFixedColumnsCount();