Index: src/libictranslate/ResourceManager.cpp
===================================================================
diff -u -N -r19b135b50b55b75d008526a799344bda9a62dc22 -r9ddf8fdd5f641491dd30c49eb90f8f740314b6af
--- src/libictranslate/ResourceManager.cpp	(.../ResourceManager.cpp)	(revision 19b135b50b55b75d008526a799344bda9a62dc22)
+++ src/libictranslate/ResourceManager.cpp	(.../ResourceManager.cpp)	(revision 9ddf8fdd5f641491dd30c49eb90f8f740314b6af)
@@ -704,8 +704,8 @@
 		translation_map::const_iterator it = m_mapTranslation.find((wHiID << 16) | wLoID);
 		if(it != m_mapTranslation.end())
 			return (*it).second.GetText();
-		else
-			return EMPTY_STRING;
+
+		return EMPTY_STRING;
 	}
 
 	void CLangData::EnumStrings(PFNENUMCALLBACK pfnCallback, void* pData)
@@ -721,16 +721,14 @@
 		translation_map::iterator iterTranslation = m_mapTranslation.find(uiTranslationKey);
 		if(iterTranslation != m_mapTranslation.end())
 			return &(*iterTranslation).second;
-		else
+
+		if(bCreate)
 		{
-			if(bCreate)
+			std::pair<translation_map::iterator, bool> pairTranslation = m_mapTranslation.insert(std::make_pair(uiTranslationKey, CTranslationItem()));
+			if(pairTranslation.second)
 			{
-				std::pair<translation_map::iterator, bool> pairTranslation = m_mapTranslation.insert(std::make_pair(uiTranslationKey, CTranslationItem()));
-				if(pairTranslation.second)
-				{
-					m_bModified = true;
-					return &(*pairTranslation.first).second;
-				}
+				m_bModified = true;
+				return &(*pairTranslation.first).second;
 			}
 		}
 
@@ -774,17 +772,15 @@
 	{
 		if(bFullPath)
 			return m_pszFilename;
-		else
-		{
-			if(m_pszFilename)
-			{
-				TCHAR *pszFnd = _tcsrchr(m_pszFilename, _T('\\'));
-				if(pszFnd)
-					return pszFnd + 1;
-			}
 
-			return m_pszFilename;
+		if(m_pszFilename)
+		{
+			TCHAR *pszFnd = _tcsrchr(m_pszFilename, _T('\\'));
+			if(pszFnd)
+				return pszFnd + 1;
 		}
+
+		return m_pszFilename;
 	}
 
 	void CLangData::SetLangName(PCTSTR psz)