diff --git a/code/Q3BSPFileImporter.cpp b/code/Q3BSPFileImporter.cpp
index 2526aeb26..bfdafcc96 100644
--- a/code/Q3BSPFileImporter.cpp
+++ b/code/Q3BSPFileImporter.cpp
@@ -131,11 +131,11 @@ static void normalizePathName( const std::string &rPath, std::string &rNormalize
     static const unsigned int numDelimiters = 2;
     const char delimiters[ numDelimiters ] = { '/', '\\' };
     rNormalizedPath = rPath;
-    for ( unsigned int i=0; i<numDelimiters; i++ )
+    for (const char delimiter : delimiters)
     {
         for ( size_t j=0; j<rNormalizedPath.size(); j++ )
         {
-            if ( rNormalizedPath[j] == delimiters[ i ] )
+            if ( rNormalizedPath[j] == delimiter )
             {
                 rNormalizedPath[ j ] = sep[ 0 ];
             }
diff --git a/code/Q3BSPZipArchive.cpp b/code/Q3BSPZipArchive.cpp
index cdc6ea2c5..0222042db 100644
--- a/code/Q3BSPZipArchive.cpp
+++ b/code/Q3BSPZipArchive.cpp
@@ -195,8 +195,8 @@ Q3BSPZipArchive::Q3BSPZipArchive(IOSystem* pIOHandler, const std::string& rFile)
 // ------------------------------------------------------------------------------------------------
 //  Destructor.
 Q3BSPZipArchive::~Q3BSPZipArchive() {
-    for( std::map<std::string, ZipFile*>::iterator it(m_ArchiveMap.begin()), end(m_ArchiveMap.end()); it != end; ++it ) {
-        delete it->second;
+    for(auto &file : m_ArchiveMap) {
+        delete file.second;
     }
     m_ArchiveMap.clear();
 
@@ -269,8 +269,8 @@ void Q3BSPZipArchive::Close(IOStream *pFile) {
 void Q3BSPZipArchive::getFileList(std::vector<std::string> &rFileList) {
     rFileList.clear();
 
-    for(std::map<std::string, ZipFile*>::iterator it(m_ArchiveMap.begin()), end(m_ArchiveMap.end()); it != end; ++it) {
-        rFileList.push_back(it->first);
+    for(auto &file : m_ArchiveMap) {
+        rFileList.push_back(file.first);
     }
 }