diff --git a/geocoder/geocoder.cpp b/geocoder/geocoder.cpp
index 669157e..1dcc870 100644
--- a/geocoder/geocoder.cpp
+++ b/geocoder/geocoder.cpp
@@ -150,13 +150,6 @@ strings::UniString MakeHouseNumber(Tokens const & tokens)
 {
   return strings::MakeUniString(strings::JoinStrings(tokens, " "));
 }
-
-strings::UniString & AppendToHouseNumber(strings::UniString & houseNumber, std::string const & token)
-{
-  houseNumber += strings::MakeUniString(" ");
-  houseNumber += strings::MakeUniString(token);
-  return houseNumber;
-}
 }  // namespace
 
 // Geocoder::Layer ---------------------------------------------------------------------------------
@@ -522,7 +515,7 @@ void Geocoder::FillBuildingsLayer(
           if (!parentCandidateCertainty)
             return;
 
-          auto totalCertainty =
+          auto const totalCertainty =
               *parentCandidateCertainty + SumHouseNumberSubqueryCertainty(matchResult);
           auto const isOtherSimilar =
               matchResult.queryMismatchedTokensCount || matchResult.houseNumberMismatchedTokensCount;
@@ -554,9 +547,9 @@ void Geocoder::FillRegularLayer(Context const & ctx, Type type, Tokens const & s
     if (type > Type::Locality && !IsRelevantLocalityMember(ctx, d, subquery))
       return;
 
-    auto subqueryWeight =
+    auto const subqueryWeight =
         (d.m_kind != Kind::Unknown ? GetWeight(d.m_kind) : GetWeight(d.m_type)) * subquery.size();
-    auto totalCertainty = *parentCandidateCertainty + subqueryWeight;
+    auto const totalCertainty = *parentCandidateCertainty + subqueryWeight;
 
     candidates.push_back({docId, totalCertainty, false /* m_isOtherSimilar */});
   });
@@ -608,7 +601,8 @@ bool Geocoder::IsValidHouseNumberWithNextUnusedToken(
     return false;
 
   auto subqueryHouseNumber = MakeHouseNumber(subquery);
-  AppendToHouseNumber(subqueryHouseNumber, ctx.GetToken(nextTokenPos));
+  subqueryHouseNumber += strings::MakeUniString(" ");
+  subqueryHouseNumber += strings::MakeUniString(ctx.GetToken(nextTokenPos));
 
   return search::house_numbers::LooksLikeHouseNumber(subqueryHouseNumber, false /* isPrefix */);
 }
diff --git a/geocoder/house_numbers_matcher.cpp b/geocoder/house_numbers_matcher.cpp
index d5c835f..e2a0787 100644
--- a/geocoder/house_numbers_matcher.cpp
+++ b/geocoder/house_numbers_matcher.cpp
@@ -536,7 +536,7 @@ bool HouseNumbersMatch(strings::UniString const & houseNumber, strings::UniStrin
 
 bool HouseNumbersMatch(strings::UniString const & houseNumber, vector<Token> const & queryParse)
 {
-  auto && matchResult = MatchResult{};
+  MatchResult matchResult{};
   return HouseNumbersMatch(houseNumber, queryParse, matchResult);
 }