diff --git a/SparkleLib/SparkleConfig.cs b/SparkleLib/SparkleConfig.cs
index 0bbbdab4..88f99835 100644
--- a/SparkleLib/SparkleConfig.cs
+++ b/SparkleLib/SparkleConfig.cs
@@ -62,11 +62,10 @@ namespace SparkleLib {
                 SparkleBackend.Platform == PlatformID.MacOSX) {
 
                 user_name = new UnixUserInfo (UnixEnvironment.UserName).RealName;
-                if (string.IsNullOrEmpty (user_name)) {
+                if (string.IsNullOrEmpty (user_name))
                     user_name = UnixEnvironment.UserName;
-                } else {
+                else
                     user_name = user_name.TrimEnd (",".ToCharArray());
-                }
 
             } else {
                 user_name = Environment.UserName;
diff --git a/SparkleLib/SparkleRepoBase.cs b/SparkleLib/SparkleRepoBase.cs
index 883e0338..96a70ac2 100644
--- a/SparkleLib/SparkleRepoBase.cs
+++ b/SparkleLib/SparkleRepoBase.cs
@@ -34,15 +34,15 @@ namespace SparkleLib {
 
     public abstract class SparkleRepoBase {
 
-
-
-        private Timer local_timer = new Timer () { Interval = 250 };
-        private Timer remote_timer = new Timer () { Interval = 60000 };
         private FileSystemWatcher watcher;
         private SparkleListenerBase listener;
+        private Timer local_timer        = new Timer () { Interval = 250 };
+        private Timer remote_timer       = new Timer () { Interval = 60000 };
+        private DateTime last_poll       = DateTime.Now;
+        private TimeSpan poll_interval   = new TimeSpan (0, 0, 10, 0);
         private List <double> sizebuffer = new List<double> ();
-        private bool has_changed   = false;
-        private Object change_lock = new Object ();
+        private bool has_changed         = false;
+        private Object change_lock       = new Object ();
 
         protected SyncStatus status;
         protected bool is_buffering  = false;