Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/EngineInterface.cs
===================================================================
diff -u -r3893 -r4000
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/EngineInterface.cs	(.../EngineInterface.cs)	(revision 3893)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/EngineInterface.cs	(.../EngineInterface.cs)	(revision 4000)
@@ -38,10 +38,6 @@
     /// </summary>
     public class EngineInterface
     {
-        private ProgressDelegate progressDelegate;
-        private SendMessageDelegate sendMessageDelegate;
-        private UserAbortDelegate userAbortDelegate;
-        
         /// <summary>
         /// Initializes a new instance of the <see cref="EngineInterface"/> class.
         /// </summary>
@@ -55,7 +51,11 @@
 
             Input input = DamXmlSerialization.LoadInputFromXmlString(modelInput);
             DamProjectData = FillDamFromXmlInput.CreateDamProjectData(input);
-            SendMessage(new LogMessage() { MessageType = LogMessageType.Info, Message = Resources.ModelAccepted });
+            SendMessage(new LogMessage
+            {
+                MessageType = LogMessageType.Info,
+                Message = Resources.ModelAccepted
+            });
         }
 
         /// <summary>
@@ -64,53 +64,23 @@
         /// <value>
         /// The progress delegate.
         /// </value>
-        public ProgressDelegate ProgressDelegate
-        {
-            get
-            {
-                return progressDelegate;
-            }
-            set
-            {
-                progressDelegate = value;
-            }
-        }
+        public ProgressDelegate ProgressDelegate { get; set; }
 
         /// <summary>
         /// Gets or sets the send message delegate.
         /// </summary>
         /// <value>
         /// The send message delegate.
         /// </value>
-        public SendMessageDelegate SendMessageDelegate
-        {
-            get
-            {
-                return sendMessageDelegate;
-            }
-            set
-            {
-                sendMessageDelegate = value;
-            }
-        }
+        public SendMessageDelegate SendMessageDelegate { get; set; }
 
         /// <summary>
         /// Gets or sets the user abort delegate.
         /// </summary>
         /// <value>
         /// The user abort delegate.
         /// </value>
-        public UserAbortDelegate UserAbortDelegate
-        {
-            get
-            {
-                return userAbortDelegate;
-            }
-            set
-            {
-                userAbortDelegate = value;
-            }
-        }
+        public UserAbortDelegate UserAbortDelegate { get; set; }
 
         /// <summary>
         /// Gets or sets the dam project data.
@@ -120,35 +90,17 @@
         /// </value>
         public DamProjectData DamProjectData { get; set; }
 
-        private void SendMessage(LogMessage logMessage)
-        {
-            SendMessageDelegate?.Invoke(logMessage);
-        }
-
-        private void Progress(double progress)
-        {
-            ProgressDelegate?.Invoke(progress);
-        }
-
-        private bool UserAbort()
-        {
-            if (UserAbortDelegate != null)
-            {
-                return UserAbortDelegate();
-            }
-            else
-            {
-                return false;
-            }
-        }
-
         /// <summary>
         /// Validates the model.
         /// </summary>
         /// <returns>Validation messages in an XML string</returns>
         public string Validate()
         {
-            SendMessage(new LogMessage() { MessageType = LogMessageType.Info, Message = Resources.StartValidation });
+            SendMessage(new LogMessage
+            {
+                MessageType = LogMessageType.Info,
+                Message = Resources.StartValidation
+            });
             List<LogMessage> validationMessages = null;
 
             try
@@ -157,11 +109,13 @@
             }
             catch (Exception e)
             {
-                var validationMessage = new LogMessage(LogMessageType.Error,null, e.Message);
-                validationMessages = new List<LogMessage> {validationMessage};
+                var validationMessage = new LogMessage(LogMessageType.Error, null, e.Message);
+                validationMessages = new List<LogMessage>
+                {
+                    validationMessage
+                };
                 DamProjectData.CalculationMessages = new List<LogMessage>();
             }
-              
 
             // Local validation can give messages and these have to be added to the results but note that there
             // already can be messages added by instantiation of the interface too. So add the local to the global
@@ -178,10 +132,19 @@
             {
                 Output output = FillXmlOutputFromDam.CreateOutput(DamProjectData);
                 string outputXml = DamXmlSerialization.SaveOutputAsXmlString(output);
-                SendMessage(new LogMessage() { MessageType = LogMessageType.Info, Message = Resources.EndValidation });
+                SendMessage(new LogMessage
+                {
+                    MessageType = LogMessageType.Info,
+                    Message = Resources.EndValidation
+                });
                 return outputXml;
             }
-            SendMessage(new LogMessage() { MessageType = LogMessageType.Info, Message = Resources.EndValidation });
+
+            SendMessage(new LogMessage
+            {
+                MessageType = LogMessageType.Info,
+                Message = Resources.EndValidation
+            });
             return null;
         }
 
@@ -192,7 +155,11 @@
         public string Run()
         {
             string outputXml;
-            SendMessage(new LogMessage() { MessageType = LogMessageType.Info, Message = Resources.StartCalculation });
+            SendMessage(new LogMessage
+            {
+                MessageType = LogMessageType.Info,
+                Message = Resources.StartCalculation
+            });
 
             switch (DamProjectData.DamProjectType)
             {
@@ -201,15 +168,40 @@
                     operationalCalculator.Execute(DamProjectData);
                     break;
                 case DamProjectType.Design:
-                    DesignCalculator designCalculator = new DesignCalculator();
-                    designCalculator.RegisterProgress(progressDelegate);
+                    var designCalculator = new DesignCalculator();
+                    designCalculator.RegisterProgress(ProgressDelegate);
                     designCalculator.Execute(DamProjectData);
                     break;
             }
+
             Output output = FillXmlOutputFromDam.CreateOutput(DamProjectData);
             outputXml = DamXmlSerialization.SaveOutputAsXmlString(output);
-            SendMessage(new LogMessage() { MessageType = LogMessageType.Info, Message = Resources.EndCalculation });
+            SendMessage(new LogMessage
+            {
+                MessageType = LogMessageType.Info,
+                Message = Resources.EndCalculation
+            });
             return outputXml;
         }
+
+        private void SendMessage(LogMessage logMessage)
+        {
+            SendMessageDelegate?.Invoke(logMessage);
+        }
+
+        private void Progress(double progress)
+        {
+            ProgressDelegate?.Invoke(progress);
+        }
+
+        private bool UserAbort()
+        {
+            if (UserAbortDelegate != null)
+            {
+                return UserAbortDelegate();
+            }
+
+            return false;
+        }
     }
-}
+}
\ No newline at end of file