diff --git a/src/common/symbols.cpp b/src/common/symbols.cpp
index f23e51c9d..db8340043 100644
--- a/src/common/symbols.cpp
+++ b/src/common/symbols.cpp
@@ -8,46 +8,43 @@ TSymbolsMap g_symbols;
 
 namespace Symbols
 {
-    bool HasSymbol(u32 _address)
+    bool HasSymbol(u32 address)
     {
-        return g_symbols.find(_address) != g_symbols.end();
+        return g_symbols.find(address) != g_symbols.end();
     }
 
-    void Add(u32 _address, const std::string& _name, u32 _size, u32 _type)
+    void Add(u32 address, const std::string& name, u32 size, u32 type)
     {
-        if (!HasSymbol(_address))
+        if (!HasSymbol(address))
         {
             TSymbol symbol;
-            symbol.address = _address;
-            symbol.name = _name;
-            symbol.size = _size;
-            symbol.type = _type;
+            symbol.address = address;
+            symbol.name = name;
+            symbol.size = size;
+            symbol.type = type;
 
-            g_symbols.insert(TSymbolsPair(_address, symbol));
+            g_symbols.emplace(address, symbol);
         }
     }
 
-    TSymbol GetSymbol(u32 _address)
+    TSymbol GetSymbol(u32 address)
     {
-        TSymbolsMap::iterator foundSymbolItr;
-        TSymbol symbol;
+        const auto iter = g_symbols.find(address);
 
-        foundSymbolItr = g_symbols.find(_address);
-        if (foundSymbolItr != g_symbols.end())
-        {
-            symbol = (*foundSymbolItr).second;
-        }
+        if (iter != g_symbols.end())
+            return iter->second;
 
-        return symbol;
-    }
-    const std::string GetName(u32 _address)
-    {
-        return GetSymbol(_address).name;
+        return {};
     }
 
-    void Remove(u32 _address)
+    const std::string GetName(u32 address)
     {
-        g_symbols.erase(_address);
+        return GetSymbol(address).name;
+    }
+
+    void Remove(u32 address)
+    {
+        g_symbols.erase(address);
     }
 
     void Clear()
diff --git a/src/common/symbols.h b/src/common/symbols.h
index 6b62b011e..5ed16009c 100644
--- a/src/common/symbols.h
+++ b/src/common/symbols.h
@@ -12,15 +12,10 @@
 
 struct TSymbol
 {
-    TSymbol() :
-        address(0),
-        size(0),
-        type(0)
-    {}
-    u32     address;
+    u32     address = 0;
     std::string name;
-    u32     size;
-    u32     type;
+    u32     size = 0;
+    u32     type = 0;
 };
 
 typedef std::map<u32, TSymbol> TSymbolsMap;
@@ -28,12 +23,12 @@ typedef std::pair<u32, TSymbol> TSymbolsPair;
 
 namespace Symbols
 {
-    bool HasSymbol(u32 _address);
+    bool HasSymbol(u32 address);
 
-    void Add(u32 _address, const std::string& _name, u32 _size, u32 _type);
-    TSymbol GetSymbol(u32 _address);
-    const std::string GetName(u32 _address);
-    void Remove(u32 _address);
+    void Add(u32 address, const std::string& name, u32 size, u32 type);
+    TSymbol GetSymbol(u32 address);
+    const std::string GetName(u32 address);
+    void Remove(u32 address);
     void Clear();
 }