diff --git a/database/SqliteDatabase.h b/database/SqliteDatabase.h
index 7cd94f45e..8ba9d796b 100644
--- a/database/SqliteDatabase.h
+++ b/database/SqliteDatabase.h
@@ -40,5 +40,6 @@ public:
 	uint64 getBigInt(int colIndex);
 
 	void escape(const unsigned char* start,int size,std::string& retStr);
-
 };
+
+// vim:ts=4
diff --git a/src/ConnectionPool.cpp b/src/ConnectionPool.cpp
index 931fe93e2..728795c41 100644
--- a/src/ConnectionPool.cpp
+++ b/src/ConnectionPool.cpp
@@ -81,26 +81,27 @@ bool ConnectionPool::savePeer(const std::string& strIp, int iPort,char code)
 	return false;
 }
 
+// <-- true, if a peer is available to connect to
 bool ConnectionPool::peerAvailable(std::string& strIp, int& iPort)
 {
 	Database*					db = theApp->getWalletDB()->getDB();
 	std::vector<std::string>	vstrIpPort;
 
+	// Convert mIpMap (list of open connections) to a vector of "<ip> <port>".
 	{
 		boost::mutex::scoped_lock	sl(mPeerLock);
-		pipPeer						ipPeer;
-
 		vstrIpPort.reserve(mIpMap.size());
 
-		BOOST_FOREACH(ipPeer, mIpMap)
+		BOOST_FOREACH(pipPeer ipPeer, mIpMap)
 		{
-			std::string&	strIp	= ipPeer.first.first;
-			int				iPort	= ipPeer.first.second;
+			const std::string&	strIp	= ipPeer.first.first;
+			int					iPort	= ipPeer.first.second;
 
 			vstrIpPort.push_back(db->escape(str(boost::format("%s %d") % strIp % iPort)));
 		}
 	}
 
+	// Get the first IpPort entry which is not in vector and which is not scheduled for scanning.
 	std::string strIpPort;
 
 	ScopedLock	sl(theApp->getWalletDB()->getDBLock());