diff --git a/core/src/com/unciv/logic/MapSaver.kt b/core/src/com/unciv/logic/MapSaver.kt
index c7e48f582b..c8864585d0 100644
--- a/core/src/com/unciv/logic/MapSaver.kt
+++ b/core/src/com/unciv/logic/MapSaver.kt
@@ -4,7 +4,7 @@ import com.badlogic.gdx.Gdx
 import com.unciv.logic.map.TileMap
 import com.unciv.ui.saves.Gzip
 
-class MapSaver(){
+class MapSaver {
     fun json() = GameSaver().json()
     private val mapsFolder = "maps"
 
diff --git a/core/src/com/unciv/logic/map/BFS.kt b/core/src/com/unciv/logic/map/BFS.kt
index 811266e2da..3622b85580 100644
--- a/core/src/com/unciv/logic/map/BFS.kt
+++ b/core/src/com/unciv/logic/map/BFS.kt
@@ -29,7 +29,7 @@ class BFS(val startingPoint: TileInfo, val predicate : (TileInfo) -> Boolean){
         for(tileInfo in tilesToCheck){
             for(neighbor in tileInfo.neighbors){
                 if(predicate(neighbor) && !tilesReached.containsKey(neighbor)){
-                    tilesReached[neighbor] = tileInfo;
+                    tilesReached[neighbor] = tileInfo
                     newTilesToCheck.add(neighbor)
                 }
             }
diff --git a/core/src/com/unciv/logic/map/MapGenerator.kt b/core/src/com/unciv/logic/map/MapGenerator.kt
index 4909c41303..62d2da9082 100644
--- a/core/src/com/unciv/logic/map/MapGenerator.kt
+++ b/core/src/com/unciv/logic/map/MapGenerator.kt
@@ -25,7 +25,7 @@ class MapType {
     }
 }
 
-class MapGenerator() {
+class MapGenerator {
 
     fun generateMap(gameParameters: GameParameters): TileMap {
         val mapRadius = gameParameters.mapRadius
@@ -269,7 +269,7 @@ class MapGenerator() {
     }
 }
 
-class MapLandmassGenerator(){
+class MapLandmassGenerator {
 
     fun generateLandCellularAutomata(tileMap: TileMap, mapRadius: Int, mapType: String) {
 
diff --git a/core/src/com/unciv/models/metadata/GameParameters.kt b/core/src/com/unciv/models/metadata/GameParameters.kt
index 04e407ba24..8811ffc813 100644
--- a/core/src/com/unciv/models/metadata/GameParameters.kt
+++ b/core/src/com/unciv/models/metadata/GameParameters.kt
@@ -17,7 +17,7 @@ class GameParameters { // Default values are the default new game
     var mapType = MapType.pangaea
     var noBarbarians = false
     var oneCityChallenge = false
-    var noRuins = false;
+    var noRuins = false
     var mapFileName: String? = null
     var victoryTypes: ArrayList<VictoryType> = VictoryType.values().toCollection(ArrayList()) // By default, all victory types
     var startingEra = TechEra.Ancient
diff --git a/core/src/com/unciv/ui/cityscreen/CityScreenCityPickerTable.kt b/core/src/com/unciv/ui/cityscreen/CityScreenCityPickerTable.kt
index 625ad7c6e5..87453e21e1 100644
--- a/core/src/com/unciv/ui/cityscreen/CityScreenCityPickerTable.kt
+++ b/core/src/com/unciv/ui/cityscreen/CityScreenCityPickerTable.kt
@@ -55,7 +55,7 @@ class CityScreenCityPickerTable(val cityScreen: CityScreen) : Table(){
         currentCityLabel.onClick {
             val editCityNamePopup = PopupTable(cityScreen)
             val textArea = TextField(city.name, CameraStageBaseScreen.skin)
-            textArea.setAlignment(Align.center)
+            textArea.alignment = Align.center
             editCityNamePopup.add(textArea).colspan(2).row()
             editCityNamePopup.addCloseButton()
             editCityNamePopup.addButton("Save".tr()){
diff --git a/core/src/com/unciv/ui/tilegroups/CityButton.kt b/core/src/com/unciv/ui/tilegroups/CityButton.kt
index 87fcefa17d..b3aa901f73 100644
--- a/core/src/com/unciv/ui/tilegroups/CityButton.kt
+++ b/core/src/com/unciv/ui/tilegroups/CityButton.kt
@@ -101,7 +101,7 @@ class CityButton(val city: CityInfo, internal val tileGroup: WorldTileGroup, ski
 
         if (city.isPuppet) {
             val puppetImage = ImageGetter.getImage("OtherIcons/Puppet")
-            puppetImage.setColor(secondaryColor)
+            puppetImage.color = secondaryColor
             iconTable.add(puppetImage).size(20f).pad(2f).padLeft(5f)
         }
 
diff --git a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt
index e9a43797c8..fbf8a1ba1f 100644
--- a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt
+++ b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt
@@ -99,7 +99,7 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo):CameraStageBaseScreen() {
         val ally = otherCiv.getAllyCiv()
         if (ally != "")
         {
-            diplomacyTable.add(("Ally: ".tr() + ally!!.tr() + " " + "Influence: ".tr()
+            diplomacyTable.add(("Ally: ".tr() + ally.tr() + " " + "Influence: ".tr()
                     + otherCiv.getDiplomacyManager(ally).influence.toString().tr()).toLabel()).row()
         }
         val nextLevelString: String
diff --git a/core/src/com/unciv/ui/worldscreen/optionstable/DropBox.kt b/core/src/com/unciv/ui/worldscreen/optionstable/DropBox.kt
index 71430e63fd..8594ec8152 100644
--- a/core/src/com/unciv/ui/worldscreen/optionstable/DropBox.kt
+++ b/core/src/com/unciv/ui/worldscreen/optionstable/DropBox.kt
@@ -11,7 +11,7 @@ import java.net.HttpURLConnection
 import java.net.URL
 import java.nio.charset.StandardCharsets
 
-class DropBox(){
+class DropBox {
 
     fun dropboxApi(url:String, data:String="",contentType:String="",dropboxApiArg:String=""): InputStream? {
 
@@ -84,7 +84,7 @@ class DropBox(){
 
 }
 
-class OnlineMultiplayer(){
+class OnlineMultiplayer {
     fun getGameLocation(gameId:String) = "/MultiplayerGames/$gameId"
 
     fun tryUploadGame(gameInfo: GameInfo){
diff --git a/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt b/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt
index 30d495ee47..a63d1ec507 100644
--- a/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt
+++ b/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt
@@ -16,7 +16,7 @@ import kotlin.concurrent.thread
 class Language(val language:String){
     val percentComplete:Int
     init{
-        val availableTranslations = GameBasics.Translations.count() { it.value.containsKey(language) }
+        val availableTranslations = GameBasics.Translations.count { it.value.containsKey(language) }
         if(language=="English") percentComplete = 100
         else percentComplete = (availableTranslations*100 / GameBasics.Translations.size)
     }
diff --git a/core/src/core/java/nativefont/NativeFont.java b/core/src/core/java/nativefont/NativeFont.java
index ef96af4396..5652593638 100755
--- a/core/src/core/java/nativefont/NativeFont.java
+++ b/core/src/core/java/nativefont/NativeFont.java
@@ -203,7 +203,7 @@ public class NativeFont extends BitmapFont {
                 EmojiDate date = this.emojiSet.get(css);
                 appendEmoji(c2 + "", date.path, date.size);
             } else {
-                putGlyph(c2, this.listener.getFontPixmap(txt, this.paint));
+                putGlyph(c2, listener.getFontPixmap(txt, this.paint));
             }
         }
 
@@ -265,7 +265,7 @@ public class NativeFont extends BitmapFont {
 
             for (Glyph glyph : page) {
                 if (glyph != null) {
-                    TextureRegion region = (TextureRegion) getRegions().get(glyph.page);
+                    TextureRegion region = getRegions().get(glyph.page);
                     if (region == null) {
                         throw new IllegalArgumentException("BitmapFont texture region array cannot contain null elements.");
                     }