diff --git a/core/src/com/unciv/logic/city/CityConstructions.kt b/core/src/com/unciv/logic/city/CityConstructions.kt
index e794a78766..135b9aff97 100644
--- a/core/src/com/unciv/logic/city/CityConstructions.kt
+++ b/core/src/com/unciv/logic/city/CityConstructions.kt
@@ -27,17 +27,24 @@ import kotlin.math.roundToInt
  * @property constructionQueue a list of constructions names enqueued
  */
 class CityConstructions {
-    @Transient lateinit var cityInfo: CityInfo
-    @Transient private var builtBuildingObjects = ArrayList<Building>()
-    @Transient val builtBuildingUniqueMap = UniqueMap()
+    @Transient
+    lateinit var cityInfo: CityInfo
+
+    @Transient
+    private var builtBuildingObjects = ArrayList<Building>()
+
+    @Transient
+    val builtBuildingUniqueMap = UniqueMap()
 
     var builtBuildings = HashSet<String>()
     val inProgressConstructions = HashMap<String, Int>()
     var currentConstructionFromQueue: String
         get() {
-            if(constructionQueue.isEmpty()) return "" else return constructionQueue.first()
+            if (constructionQueue.isEmpty()) return "" else return constructionQueue.first()
+        }
+        set(value) {
+            if (constructionQueue.isEmpty()) constructionQueue.add(value) else constructionQueue[0] = value
         }
-        set(value) { if(constructionQueue.isEmpty()) constructionQueue.add(value) else constructionQueue[0]=value }
     var currentConstructionIsUserSet = false
     var constructionQueue = mutableListOf<String>()
     val queueMaxSize = 10
@@ -47,7 +54,7 @@ class CityConstructions {
         val toReturn = CityConstructions()
         toReturn.builtBuildings.addAll(builtBuildings)
         toReturn.inProgressConstructions.putAll(inProgressConstructions)
-        toReturn.currentConstructionIsUserSet=currentConstructionIsUserSet
+        toReturn.currentConstructionIsUserSet = currentConstructionIsUserSet
         toReturn.constructionQueue.addAll(constructionQueue)
         return toReturn
     }
@@ -122,7 +129,7 @@ class CityConstructions {
            currentConstruction changed on another thread */
         val currentConstructionSnapshot = currentConstructionFromQueue
         var result = currentConstructionSnapshot.tr()
-        if (currentConstructionSnapshot!=""
+        if (currentConstructionSnapshot != ""
                 && !PerpetualConstruction.perpetualConstructionsMap.containsKey(currentConstructionSnapshot)) {
             val turnsLeft = turnsToConstruction(currentConstructionSnapshot)
             result += " - $turnsLeft${Fonts.turn}"
@@ -163,14 +170,14 @@ class CityConstructions {
             }
         }
 
-        class NotBuildingOrUnitException(message:String):Exception(message)
+        class NotBuildingOrUnitException(message: String) : Exception(message)
         throw NotBuildingOrUnitException("$constructionName is not a building or a unit!")
     }
 
     internal fun getBuiltBuildings(): Sequence<Building> = builtBuildingObjects.asSequence()
 
     fun containsBuildingOrEquivalent(building: String): Boolean =
-            isBuilt(building) || getBuiltBuildings().any{it.replaces==building}
+            isBuilt(building) || getBuiltBuildings().any { it.replaces == building }
 
     fun getWorkDone(constructionName: String): Int {
         if (inProgressConstructions.containsKey(constructionName)) return inProgressConstructions[constructionName]!!
@@ -188,7 +195,7 @@ class CityConstructions {
 
     fun turnsToConstruction(constructionName: String, useStoredProduction: Boolean = true): Int {
         val workLeft = getRemainingWork(constructionName, useStoredProduction)
-        if(workLeft < 0) // we've done more work than actually necessary - possible if circumstances cause buildings to be cheaper later
+        if (workLeft < 0) // we've done more work than actually necessary - possible if circumstances cause buildings to be cheaper later
             return 1 // we'll finish this next turn
 
         val cityStatsForConstruction: Stats
@@ -214,9 +221,11 @@ class CityConstructions {
     //endregion
 
     //region state changing functions
-    fun setTransients(){
-        builtBuildingObjects = ArrayList(builtBuildings.map { cityInfo.getRuleset().buildings[it]
-                    ?: throw java.lang.Exception("Building $it is not found!")})
+    fun setTransients() {
+        builtBuildingObjects = ArrayList(builtBuildings.map {
+            cityInfo.getRuleset().buildings[it]
+                    ?: throw java.lang.Exception("Building $it is not found!")
+        })
         updateUniques()
     }
 
@@ -226,11 +235,11 @@ class CityConstructions {
         inProgressConstructions[currentConstructionFromQueue] = inProgressConstructions[currentConstructionFromQueue]!! + productionToAdd
     }
 
-    fun constructIfEnough(){
+    fun constructIfEnough() {
         validateConstructionQueue()
 
         val construction = getConstruction(currentConstructionFromQueue)
-        if(construction is PerpetualConstruction) chooseNextConstruction() // check every turn if we could be doing something better, because this doesn't end by itself
+        if (construction is PerpetualConstruction) chooseNextConstruction() // check every turn if we could be doing something better, because this doesn't end by itself
         else {
             val productionCost = construction.getProductionCost(cityInfo.civInfo)
             if (inProgressConstructions.containsKey(currentConstructionFromQueue)
@@ -244,7 +253,7 @@ class CityConstructions {
         validateConstructionQueue()
         validateInProgressConstructions()
 
-        if(getConstruction(currentConstructionFromQueue) !is PerpetualConstruction)
+        if (getConstruction(currentConstructionFromQueue) !is PerpetualConstruction)
             addProductionPoints(cityStats.production.roundToInt())
     }
 
@@ -301,24 +310,24 @@ class CityConstructions {
             cityInfo.civInfo.addNotification("[${construction.name}] has been built in [" + cityInfo.name + "]", cityInfo.location, Color.BROWN)
     }
 
-    fun addBuilding(buildingName:String){
+    fun addBuilding(buildingName: String) {
         val buildingObject = cityInfo.getRuleset().buildings[buildingName]!!
         builtBuildingObjects = builtBuildingObjects.withItem(buildingObject)
         builtBuildings.add(buildingName)
         updateUniques()
     }
 
-    fun removeBuilding(buildingName:String){
+    fun removeBuilding(buildingName: String) {
         val buildingObject = cityInfo.getRuleset().buildings[buildingName]!!
         builtBuildingObjects = builtBuildingObjects.withoutItem(buildingObject)
         builtBuildings.remove(buildingName)
         updateUniques()
     }
 
-    fun updateUniques(){
+    fun updateUniques() {
         builtBuildingUniqueMap.clear()
-        for(building in getBuiltBuildings())
-            for(unique in building.uniqueObjects)
+        for (building in getBuiltBuildings())
+            for (unique in building.uniqueObjects)
                 builtBuildingUniqueMap.addUnique(unique)
     }
 
@@ -369,7 +378,7 @@ class CityConstructions {
         return cultureBuildingToBuild
     }
 
-    private fun removeCurrentConstruction() = removeFromQueue(0,true)
+    private fun removeCurrentConstruction() = removeFromQueue(0, true)
 
     fun chooseNextConstruction() {
         validateConstructionQueue()
@@ -398,14 +407,13 @@ class CityConstructions {
     }
 
     /** If this was done automatically, we should automatically try to choose a new construction and treat it as such */
-    fun removeFromQueue(constructionQueueIndex: Int, automatic:Boolean) {
+    fun removeFromQueue(constructionQueueIndex: Int, automatic: Boolean) {
         constructionQueue.removeAt(constructionQueueIndex)
-        if (constructionQueue.isEmpty()){
-            if(automatic) chooseNextConstruction()
+        if (constructionQueue.isEmpty()) {
+            if (automatic) chooseNextConstruction()
             else constructionQueue.add("Nothing") // To prevent Construction Automation
             currentConstructionIsUserSet = false
-        }
-        else currentConstructionIsUserSet = true // we're just continuing the regular queue
+        } else currentConstructionIsUserSet = true // we're just continuing the regular queue
     }
 
     fun raisePriority(constructionQueueIndex: Int) {
@@ -414,7 +422,7 @@ class CityConstructions {
 
     // Lowering == Highering next element in queue
     fun lowerPriority(constructionQueueIndex: Int) {
-        raisePriority(constructionQueueIndex+1)
+        raisePriority(constructionQueueIndex + 1)
     }
 
     //endregion
@@ -423,4 +431,4 @@ class CityConstructions {
         this[idx1] = this[idx2]
         this[idx2] = tmp
     }
-} // for json parsing, we need to have a default constructor
+}
\ No newline at end of file
diff --git a/core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt b/core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt
index c92f63740f..81b437abde 100644
--- a/core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt
+++ b/core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt
@@ -42,9 +42,9 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre
         }
 
         constructionsQueueScrollPane = ScrollPane(constructionsQueueTable.addBorder(2f, Color.WHITE))
-        constructionsQueueScrollPane.setOverscroll(false,false)
+        constructionsQueueScrollPane.setOverscroll(false, false)
         availableConstructionsScrollPane = ScrollPane(availableConstructionsTable.addBorder(2f, Color.WHITE))
-        availableConstructionsScrollPane.setOverscroll(false,false)
+        availableConstructionsScrollPane.setOverscroll(false, false)
 
         constructionsQueueTable.background = ImageGetter.getBackground(Color.BLACK)
         availableConstructionsTable.background = ImageGetter.getBackground(Color.BLACK)
@@ -98,7 +98,7 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre
             queue.forEachIndexed { i, constructionName ->
                 if (i != 0)  // This is already displayed as "Current construction"
                     constructionsQueueTable.add(getQueueEntry(i, constructionName))
-                        .expandX().fillX().row()
+                            .expandX().fillX().row()
                 if (i != queue.size - 1)
                     constructionsQueueTable.addSeparator()
             }
@@ -112,7 +112,7 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre
         getCell(constructionsQueueScrollPane).maxHeight(stage.height / 3 - 10f)
     }
 
-    private fun getConstructionButtonDTOs():ArrayList<ConstructionButtonDTO> {
+    private fun getConstructionButtonDTOs(): ArrayList<ConstructionButtonDTO> {
         val constructionButtonDTOList = ArrayList<ConstructionButtonDTO>()
 
         val city = cityScreen.city
@@ -156,7 +156,7 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre
     private fun updateAvailableConstructions() {
         val constrScrollY = availableConstructionsScrollPane.scrollY
 
-        if(!availableConstructionsTable.hasChildren()) { //
+        if (!availableConstructionsTable.hasChildren()) { //
             availableConstructionsTable.add("Loading...".toLabel()).pad(10f)
         }
         val units = ArrayList<Table>()
@@ -225,11 +225,11 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre
 
         val constructionResource = cityConstructions.getConstruction(name).getResource()
 
-        if(constructionResource != null)
-            text += "\n"+"Consumes 1 [$constructionResource]".tr()
+        if (constructionResource != null)
+            text += "\n" + "Consumes 1 [$constructionResource]".tr()
 
         table.defaults().pad(2f).minWidth(40f)
-        if(isFirstConstructionOfItsKind) table.add(getProgressBar(name)).minWidth(5f)
+        if (isFirstConstructionOfItsKind) table.add(getProgressBar(name)).minWidth(5f)
         else table.add().minWidth(5f)
         table.add(ImageGetter.getConstructionImage(name).surroundWithCircle(40f)).padRight(10f)
         table.add(text.toLabel()).expandX().fillX().left()
@@ -252,7 +252,7 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre
         return table
     }
 
-    fun getProgressBar(constructionName:String): Table {
+    fun getProgressBar(constructionName: String): Table {
         val cityConstructions = cityScreen.city.cityConstructions
         val construction = cityConstructions.getConstruction(constructionName)
         if (construction is PerpetualConstruction) return Table()
@@ -265,6 +265,7 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre
     }
 
     class ConstructionButtonDTO(val construction: IConstruction, val buttonText: String, val rejectionReason: String = "")
+
     private fun getConstructionButton(constructionButtonDTO: ConstructionButtonDTO): Table {
         val construction = constructionButtonDTO.construction
         val pickConstructionButton = Table()
@@ -306,7 +307,7 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre
 
     private fun isSelectedQueueEntry(): Boolean = selectedQueueEntry >= 0
 
-    fun cannotAddConstructionToQueue(construction:IConstruction, city:CityInfo, cityConstructions:CityConstructions): Boolean {
+    fun cannotAddConstructionToQueue(construction: IConstruction, city: CityInfo, cityConstructions: CityConstructions): Boolean {
         return cityConstructions.isQueueFull()
                 || !cityConstructions.getConstruction(construction.name).isBuildable(cityConstructions)
                 || !cityScreen.canChangeState
@@ -325,7 +326,7 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre
                 button.disable()
             else {
                 button.onClick {
-                    cityConstructions.removeFromQueue(selectedQueueEntry,false)
+                    cityConstructions.removeFromQueue(selectedQueueEntry, false)
                     cityScreen.selectedConstruction = null
                     selectedQueueEntry = -1
                     cityScreen.update()
@@ -345,7 +346,7 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre
         return button
     }
 
-    fun addConstructionToQueue(construction:IConstruction, cityConstructions: CityConstructions) {
+    fun addConstructionToQueue(construction: IConstruction, cityConstructions: CityConstructions) {
         cityConstructions.addToQueue(construction.name)
         if (!construction.shouldBeDisplayed(cityConstructions)) cityScreen.selectedConstruction = null
         cityScreen.update()
@@ -400,7 +401,7 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre
                     || !cityScreen.canChangeState
                     || city.isPuppet || city.isInResistance()
                     || !city.canPurchase(construction)
-                    || (constructionGoldCost > city.civInfo.gold && !city.civInfo.gameInfo.gameParameters.godMode) )
+                    || (constructionGoldCost > city.civInfo.gold && !city.civInfo.gameInfo.gameParameters.godMode))
                 button.disable()
         }
 
@@ -450,7 +451,7 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre
             tab.touchable = Touchable.enabled
             tab.onClick {
                 tab.touchable = Touchable.disabled
-                city.cityConstructions.removeFromQueue(constructionQueueIndex,false)
+                city.cityConstructions.removeFromQueue(constructionQueueIndex, false)
                 cityScreen.selectedConstruction = null
                 cityScreen.update()
             }
@@ -477,4 +478,4 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre
             if (table != list.last()) addSeparator()
         }
     }
-}
+}
\ No newline at end of file