diff --git a/modules/ripple_core/functional/ripple_LoadEvent.h b/modules/ripple_core/functional/ripple_LoadEvent.h
index a2abf8492..d665ec017 100644
--- a/modules/ripple_core/functional/ripple_LoadEvent.h
+++ b/modules/ripple_core/functional/ripple_LoadEvent.h
@@ -10,7 +10,7 @@
 class LoadMonitor;
 
 // VFALCO NOTE What is the difference between a LoadEvent and a LoadMonitor?
-// VFALCO TODO Rename LoadEvent to LoadMonitor::Event
+// VFALCO TODO Rename LoadEvent to ScopedLoadSample
 //
 //        This looks like a scoped elapsed time measuring class
 //
diff --git a/src/cpp/ripple/ripple_Database.cpp b/src/cpp/ripple/ripple_Database.cpp
index d52ac30ab..76ca764a0 100644
--- a/src/cpp/ripple/ripple_Database.cpp
+++ b/src/cpp/ripple/ripple_Database.cpp
@@ -4,11 +4,10 @@
 */
 //==============================================================================
 
-Database::Database (const char* host, const char* user, const char* pass) : mNumCol (0)
+Database::Database (const char* host)
+    : mNumCol (0)
 {
-    mDBPass = pass;
     mHost   = host;
-    mUser   = user;
 }
 
 Database::~Database ()
diff --git a/src/cpp/ripple/ripple_Database.h b/src/cpp/ripple/ripple_Database.h
index 078b5f506..22a8b8398 100644
--- a/src/cpp/ripple/ripple_Database.h
+++ b/src/cpp/ripple/ripple_Database.h
@@ -26,9 +26,7 @@ class JobQueue;
 class Database
 {
 public:
-    // VFALCO TODO how are user and password even used?
-    //
-    Database (const char* host, const char* user, const char* pass);
+    explicit Database (const char* host);
 
     virtual ~Database ();
 
@@ -36,11 +34,6 @@ public:
 
     virtual void disconnect () = 0;
 
-    std::string& getPass ()
-    {
-        return (mDBPass);
-    }
-
     // returns true if the query went ok
     virtual bool executeSQL (const char* sql, bool fail_okay = false) = 0;
 
@@ -105,9 +98,7 @@ protected:
     bool getColNumber (const char* colName, int* retIndex);
 
     int mNumCol;
-    std::string mUser;
     std::string mHost;
-    std::string mDBPass;
     std::vector <std::string> mColNameTable;
 };
 
diff --git a/src/cpp/ripple/ripple_InboundLedgers.cpp b/src/cpp/ripple/ripple_InboundLedgers.cpp
index e78619eb4..77f47620d 100644
--- a/src/cpp/ripple/ripple_InboundLedgers.cpp
+++ b/src/cpp/ripple/ripple_InboundLedgers.cpp
@@ -75,6 +75,16 @@ bool InboundLedgers::awaitLedgerData (uint256 const& ledgerHash)
     return true;
 }
 
+/*
+This gets called when
+    "We got some data from an inbound ledger"
+
+inboundLedgerTrigger:
+  "What do we do with this partial data?"
+  Figures out what to do with the responses to our requests for information.
+
+*/
+// means "We got some data from an inbound ledger"
 void InboundLedgers::gotLedgerData (Job&, uint256 hash,
         boost::shared_ptr<protocol::TMLedgerData> packet_ptr, boost::weak_ptr<Peer> wPeer)
 {
diff --git a/src/cpp/ripple/ripple_SqliteDatabase.cpp b/src/cpp/ripple/ripple_SqliteDatabase.cpp
index 0e29c5a4a..5b65ffc54 100644
--- a/src/cpp/ripple/ripple_SqliteDatabase.cpp
+++ b/src/cpp/ripple/ripple_SqliteDatabase.cpp
@@ -35,7 +35,10 @@ SqliteStatement::~SqliteStatement ()
     sqlite3_finalize (statement);
 }
 
-SqliteDatabase::SqliteDatabase (const char* host) : Database (host, "", ""), mWalQ (NULL), walRunning (false)
+SqliteDatabase::SqliteDatabase (const char* host)
+    : Database (host)
+    , mWalQ (NULL)
+    , walRunning (false)
 {
     mConnection     = NULL;
     mAuxConnection  = NULL;