diff --git a/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java b/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java
index dd47acd2b9..94c988272d 100644
--- a/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java
+++ b/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java
@@ -3,7 +3,6 @@ package mindustry.annotations.entity;
 import arc.files.*;
 import arc.func.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import arc.util.io.*;
 import arc.util.pooling.Pool.*;
diff --git a/annotations/src/main/java/mindustry/annotations/util/Selement.java b/annotations/src/main/java/mindustry/annotations/util/Selement.java
index 1a4c6b784a..ca7a9ce5ad 100644
--- a/annotations/src/main/java/mindustry/annotations/util/Selement.java
+++ b/annotations/src/main/java/mindustry/annotations/util/Selement.java
@@ -1,7 +1,7 @@
 package mindustry.annotations.util;
 
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import com.squareup.javapoet.*;
 import com.sun.tools.javac.code.Attribute.*;
 import mindustry.annotations.*;
@@ -19,7 +19,8 @@ public class Selement<T extends Element>{
         this.e = e;
     }
 
-    public @Nullable String doc(){
+    @Nullable
+    public String doc(){
         return BaseProcessor.elementu.getDocComment(e);
     }
 
diff --git a/core/src/mindustry/entities/comp/TeamComp.java b/core/src/mindustry/entities/comp/TeamComp.java
index 43ff376d2a..c58e97b7fd 100644
--- a/core/src/mindustry/entities/comp/TeamComp.java
+++ b/core/src/mindustry/entities/comp/TeamComp.java
@@ -17,16 +17,18 @@ abstract class TeamComp implements Posc{
         return team.rules().cheat;
     }
 
-    public @Nullable
-    Building core(){
+    @Nullable
+    public Building core(){
         return team.core();
     }
 
-    public @Nullable Building closestCore(){
+    @Nullable
+    public Building closestCore(){
         return state.teams.closestCore(x, y, team);
     }
 
-    public @Nullable Building closestEnemyCore(){
+    @Nullable
+    public Building closestEnemyCore(){
         return state.teams.closestEnemyCore(x, y, team);
     }
 }
diff --git a/core/src/mindustry/game/Team.java b/core/src/mindustry/game/Team.java
index 5390dcc01e..1ab345dc10 100644
--- a/core/src/mindustry/game/Team.java
+++ b/core/src/mindustry/game/Team.java
@@ -91,8 +91,8 @@ public class Team implements Comparable<Team>{
         return state.teams.get(this);
     }
 
-    public @Nullable
-    CoreBuild core(){
+    @Nullable
+    public CoreBuild core(){
         return data().core();
     }
 
diff --git a/core/src/mindustry/game/Teams.java b/core/src/mindustry/game/Teams.java
index 3c81acfe31..60d36ee74e 100644
--- a/core/src/mindustry/game/Teams.java
+++ b/core/src/mindustry/game/Teams.java
@@ -24,8 +24,8 @@ public class Teams{
         active.add(get(Team.crux));
     }
 
-    public @Nullable
-    CoreBuild closestEnemyCore(float x, float y, Team team){
+    @Nullable
+    public CoreBuild closestEnemyCore(float x, float y, Team team){
         for(Team enemy : team.enemies()){
             CoreBuild tile = Geometry.findClosest(x, y, enemy.cores());
             if(tile != null) return tile;
@@ -33,7 +33,8 @@ public class Teams{
         return null;
     }
 
-    public @Nullable CoreBuild closestCore(float x, float y, Team team){
+    @Nullable
+    public CoreBuild closestCore(float x, float y, Team team){
         return Geometry.findClosest(x, y, get(team).cores);
     }
 
@@ -176,7 +177,8 @@ public class Teams{
             return cores.isEmpty();
         }
 
-        public @Nullable CoreBuild core(){
+        @Nullable
+        public CoreBuild core(){
             return cores.isEmpty() ? null : cores.first();
         }
 
diff --git a/core/src/mindustry/logic/LAssembler.java b/core/src/mindustry/logic/LAssembler.java
index 99651928c7..10ccbfe1b9 100644
--- a/core/src/mindustry/logic/LAssembler.java
+++ b/core/src/mindustry/logic/LAssembler.java
@@ -202,8 +202,8 @@ public class LAssembler{
         }
     }
 
-    public @Nullable
-    BVar getVar(String name){
+    @Nullable
+    public BVar getVar(String name){
         return vars.get(name);
     }
 
diff --git a/core/src/mindustry/type/Publishable.java b/core/src/mindustry/type/Publishable.java
index c350453b05..274b5f3f7c 100644
--- a/core/src/mindustry/type/Publishable.java
+++ b/core/src/mindustry/type/Publishable.java
@@ -17,7 +17,8 @@ public interface Publishable{
     /** @return default title of the listing. */
     String steamTitle();
     /** @return standard steam listing description, may be null. this is editable by users after release.*/
-    @Nullable String steamDescription();
+    @Nullable
+    String steamDescription();
     /** @return the tag that this content has. e.g. 'schematic' or 'map'. */
     String steamTag();
     /** @return a folder with everything needed for this piece of content in it; does not need to be a copy. */
diff --git a/core/src/mindustry/world/Tiles.java b/core/src/mindustry/world/Tiles.java
index 0f3ea1deaf..a996757256 100644
--- a/core/src/mindustry/world/Tiles.java
+++ b/core/src/mindustry/world/Tiles.java
@@ -45,8 +45,8 @@ public class Tiles implements Iterable<Tile>{
     }
 
     /** @return a tile at coordinates, or null if out of bounds */
-    public @Nullable
-    Tile get(int x, int y){
+    @Nullable
+    public Tile get(int x, int y){
         return (x < 0 || x >= width || y < 0 || y >= height) ? null : array[y*width + x];
     }