diff --git a/src/object/task/taskgoto.cpp b/src/object/task/taskgoto.cpp
index 0da2de49..5d6cd475 100644
--- a/src/object/task/taskgoto.cpp
+++ b/src/object/task/taskgoto.cpp
@@ -1093,19 +1093,15 @@ CObject* CTaskGoto::SearchTarget(Math::Vector pos, float margin)
      * See issue #732
      */
 
-    CObject     *pBest;
-    Math::Vector    oPos;
-    float       dist, min;
-
-    pBest = 0;
-    min = 1000000.0f;
+    CObject* pBest = nullptr;
+    float min = 1000000.0f;
     for ( CObject* pObj : CObjectManager::GetInstancePointer()->GetAllObjects() )
     {
         if ( !pObj->GetActive() )  continue;
         if ( IsObjectBeingTransported(pObj) )  continue;  // object transtorted?
 
-        oPos = pObj->GetPosition();
-        dist = Math::DistanceProjected(pos, oPos);
+        Math::Vector oPos = pObj->GetPosition();
+        float dist = Math::DistanceProjected(pos, oPos);
 
         if ( dist <= margin && dist <= min )
         {
diff --git a/src/ui/debug_menu.cpp b/src/ui/debug_menu.cpp
index 1510e2bb..a6eb6f63 100644
--- a/src/ui/debug_menu.cpp
+++ b/src/ui/debug_menu.cpp
@@ -19,11 +19,11 @@
 
 #include "ui/debug_menu.h"
 
+#include "app/app.h"
+
 #include "common/event.h"
 #include "common/stringutils.h"
 
-#include "app/app.h"
-
 #include "graphics/engine/lightning.h"
 #include "graphics/engine/terrain.h"