diff --git a/src/commands/CmdDone.cpp b/src/commands/CmdDone.cpp
index 18d1db4ff..b42f7fea9 100644
--- a/src/commands/CmdDone.cpp
+++ b/src/commands/CmdDone.cpp
@@ -55,8 +55,8 @@ CmdDone::CmdDone ()
 ////////////////////////////////////////////////////////////////////////////////
 int CmdDone::execute (std::string&)
 {
-  int rc = 0;
-  int count = 0;
+  auto rc = 0;
+  auto count = 0;
 
   // Apply filter.
   Filter filter;
@@ -71,7 +71,7 @@ int CmdDone::execute (std::string&)
   // Accumulated project change notifications.
   std::map <std::string, std::string> projectChanges;
 
-  bool nagged = false;
+  auto nagged = false;
   for (auto& task : filtered)
   {
     Task before (task);
@@ -129,7 +129,7 @@ int CmdDone::execute (std::string&)
   }
 
   // Now list the project changes.
-  for (auto& change : projectChanges)
+  for (const auto& change : projectChanges)
     if (change.first != "")
       context.footnote (change.second);