diff --git a/src/openrct2/object/Object.cpp b/src/openrct2/object/Object.cpp
index a4ef63fc9e..0d221293e5 100644
--- a/src/openrct2/object/Object.cpp
+++ b/src/openrct2/object/Object.cpp
@@ -304,7 +304,7 @@ std::unique_ptr<IStream> ObjectAsset::GetStream() const
 
 ObjectEntryDescriptor::ObjectEntryDescriptor(const ObjectRepositoryItem& ori)
 {
-    if (ori.Identifier != "")
+    if (!ori.Identifier.empty())
     {
         Generation = ObjectGeneration::JSON;
         Identifier = std::string(ori.Identifier);
diff --git a/src/openrct2/object/TerrainEdgeObject.cpp b/src/openrct2/object/TerrainEdgeObject.cpp
index ae45c86596..dfb1c532e3 100644
--- a/src/openrct2/object/TerrainEdgeObject.cpp
+++ b/src/openrct2/object/TerrainEdgeObject.cpp
@@ -63,12 +63,7 @@ void TerrainEdgeObject::ReadJson(IReadObjectContext* context, json_t& root)
 
 TerrainEdgeObject* TerrainEdgeObject::GetById(ObjectEntryIndex entryIndex)
 {
-    TerrainEdgeObject* result = nullptr;
     auto& objMgr = OpenRCT2::GetContext()->GetObjectManager();
     auto obj = objMgr.GetLoadedObject(ObjectType::TerrainSurface, entryIndex);
-    if (obj != nullptr)
-    {
-        result = static_cast<TerrainEdgeObject*>(obj);
-    }
-    return result;
+    return obj != nullptr ? static_cast<TerrainEdgeObject*>(obj) : nullptr;
 }
diff --git a/src/openrct2/object/TerrainSurfaceObject.cpp b/src/openrct2/object/TerrainSurfaceObject.cpp
index 443c385311..666cb41c49 100644
--- a/src/openrct2/object/TerrainSurfaceObject.cpp
+++ b/src/openrct2/object/TerrainSurfaceObject.cpp
@@ -150,12 +150,7 @@ uint32_t TerrainSurfaceObject::GetImageId(
 
 TerrainSurfaceObject* TerrainSurfaceObject::GetById(ObjectEntryIndex entryIndex)
 {
-    TerrainSurfaceObject* result = nullptr;
     auto& objMgr = OpenRCT2::GetContext()->GetObjectManager();
     auto obj = objMgr.GetLoadedObject(ObjectType::TerrainSurface, entryIndex);
-    if (obj != nullptr)
-    {
-        result = static_cast<TerrainSurfaceObject*>(obj);
-    }
-    return result;
+    return obj != nullptr ? static_cast<TerrainSurfaceObject*>(obj) : nullptr;
 }
diff --git a/src/openrct2/world/MapGen.cpp b/src/openrct2/world/MapGen.cpp
index 42f3410e64..7a8794d635 100644
--- a/src/openrct2/world/MapGen.cpp
+++ b/src/openrct2/world/MapGen.cpp
@@ -145,10 +145,10 @@ void mapgen_generate(mapgen_settings* settings)
     const auto selectedEdge = TerrainEdgeObject::GetById(settings->wall);
     std::string edgeTexture = selectedFloor != nullptr ? std::string(selectedEdge->GetIdentifier()) : "";
 
-    if (floorTexture == "")
+    if (floorTexture.empty())
         floorTexture = BaseTerrain[util_rand() % std::size(BaseTerrain)];
 
-    if (edgeTexture == "")
+    if (edgeTexture.empty())
     {
         // Base edge type on surface type
         if (floorTexture == "rct2.surface.dirt")