You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@reef.apache.org by ju...@apache.org on 2015/02/13 18:57:25 UTC

[5/6] incubator-reef git commit: [REEF-157] Automated Refactorings

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultContextMessageHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultContextMessageHandler.cs b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultContextMessageHandler.cs
index 0e6715c..5e20da9 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultContextMessageHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultContextMessageHandler.cs
@@ -17,11 +17,11 @@
  * under the License.
  */
 
+using System;
 using Org.Apache.REEF.Common.Context;
+using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Utilities;
 using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Tang.Annotations;
-using System;
 
 namespace Org.Apache.REEF.Driver.Defaults
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultCustomTraceListener.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultCustomTraceListener.cs b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultCustomTraceListener.cs
index a1f897b..1bd6ba5 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultCustomTraceListener.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultCustomTraceListener.cs
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Tang.Annotations;
 using System.Diagnostics;
+using Org.Apache.REEF.Tang.Annotations;
 
 namespace Org.Apache.REEF.Driver.Defaults
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultDriverRestartContextActiveHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultDriverRestartContextActiveHandler.cs b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultDriverRestartContextActiveHandler.cs
index 5ceb271..c37b605 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultDriverRestartContextActiveHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultDriverRestartContextActiveHandler.cs
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Driver.Context;
-using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Tang.Annotations;
 using System;
 using System.Globalization;
+using Org.Apache.REEF.Driver.Context;
+using Org.Apache.REEF.Tang.Annotations;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Driver.Defaults
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultDriverRestartHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultDriverRestartHandler.cs b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultDriverRestartHandler.cs
index 1500b70..a2c04af 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultDriverRestartHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultDriverRestartHandler.cs
@@ -17,10 +17,9 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Tang.Annotations;
-using Org.Apache.REEF.Wake.Time;
 using System;
+using Org.Apache.REEF.Tang.Annotations;
+using Org.Apache.REEF.Utilities.Logging;
 using Org.Apache.REEF.Wake.Time.Event;
 
 namespace Org.Apache.REEF.Driver.Defaults

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultDriverRestartTaskRunningHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultDriverRestartTaskRunningHandler.cs b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultDriverRestartTaskRunningHandler.cs
index c202933..cfb9d15 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultDriverRestartTaskRunningHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultDriverRestartTaskRunningHandler.cs
@@ -17,10 +17,10 @@
  * under the License.
  */
 
+using System;
 using Org.Apache.REEF.Driver.Task;
-using Org.Apache.REEF.Utilities.Logging;
 using Org.Apache.REEF.Tang.Annotations;
-using System;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Driver.Defaults
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultEvaluatorAllocationHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultEvaluatorAllocationHandler.cs b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultEvaluatorAllocationHandler.cs
index 9216b64..15e8ccb 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultEvaluatorAllocationHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultEvaluatorAllocationHandler.cs
@@ -17,12 +17,11 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Common.Evaluator;
-using Org.Apache.REEF.Driver.Evaluator;
-using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Tang.Annotations;
 using System;
 using System.Globalization;
+using Org.Apache.REEF.Driver.Evaluator;
+using Org.Apache.REEF.Tang.Annotations;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Driver.Defaults
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultEvaluatorCompletionHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultEvaluatorCompletionHandler.cs b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultEvaluatorCompletionHandler.cs
index fcea53d..2be3135 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultEvaluatorCompletionHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultEvaluatorCompletionHandler.cs
@@ -17,10 +17,10 @@
  * under the License.
  */
 
+using System;
 using Org.Apache.REEF.Driver.Evaluator;
-using Org.Apache.REEF.Utilities.Logging;
 using Org.Apache.REEF.Tang.Annotations;
-using System;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Driver.Defaults
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultEvaluatorFailureHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultEvaluatorFailureHandler.cs b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultEvaluatorFailureHandler.cs
index 82cfd26..2bca1eb 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultEvaluatorFailureHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultEvaluatorFailureHandler.cs
@@ -17,12 +17,12 @@
  * under the License.
  */
 
+using System;
+using System.Globalization;
 using Org.Apache.REEF.Driver.Evaluator;
+using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Utilities.Diagnostics;
 using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Tang.Annotations;
-using System;
-using System.Globalization;
 
 namespace Org.Apache.REEF.Driver.Defaults
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultEvaluatorRequestorHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultEvaluatorRequestorHandler.cs b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultEvaluatorRequestorHandler.cs
index 465baa7..068b3cf 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultEvaluatorRequestorHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultEvaluatorRequestorHandler.cs
@@ -17,11 +17,10 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Driver.Bridge;
+using System;
 using Org.Apache.REEF.Driver.Evaluator;
-using Org.Apache.REEF.Utilities.Logging;
 using Org.Apache.REEF.Tang.Annotations;
-using System;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Driver.Defaults
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultHttpHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultHttpHandler.cs b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultHttpHandler.cs
index 831eebe..bcba2a7 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultHttpHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultHttpHandler.cs
@@ -19,9 +19,9 @@
 
 using System.Net;
 using Org.Apache.REEF.Driver.Bridge;
+using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Utilities;
 using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Tang.Annotations;
 
 namespace Org.Apache.REEF.Driver.Defaults
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultTaskCompletionHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultTaskCompletionHandler.cs b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultTaskCompletionHandler.cs
index 53eb832..d4da63e 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultTaskCompletionHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultTaskCompletionHandler.cs
@@ -17,14 +17,12 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Common.Context;
-using Org.Apache.REEF.Common.Tasks;
+using System;
+using System.Globalization;
 using Org.Apache.REEF.Driver.Context;
 using Org.Apache.REEF.Driver.Task;
-using Org.Apache.REEF.Utilities.Logging;
 using Org.Apache.REEF.Tang.Annotations;
-using System;
-using System.Globalization;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Driver.Defaults
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultTaskFailureHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultTaskFailureHandler.cs b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultTaskFailureHandler.cs
index 7235a1b..e1249cf 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultTaskFailureHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultTaskFailureHandler.cs
@@ -17,11 +17,10 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Common.Tasks;
-using Org.Apache.REEF.Driver.Task;
-using Org.Apache.REEF.Tang.Annotations;
 using System;
 using System.Globalization;
+using Org.Apache.REEF.Driver.Task;
+using Org.Apache.REEF.Tang.Annotations;
 
 namespace Org.Apache.REEF.Driver.Defaults
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultTaskMessageHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultTaskMessageHandler.cs b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultTaskMessageHandler.cs
index b67dad9..faeb180 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultTaskMessageHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultTaskMessageHandler.cs
@@ -17,11 +17,10 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Common.Tasks;
+using System;
 using Org.Apache.REEF.Driver.Task;
-using Org.Apache.REEF.Utilities.Logging;
 using Org.Apache.REEF.Tang.Annotations;
-using System;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Driver.Defaults
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultTaskRunningHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultTaskRunningHandler.cs b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultTaskRunningHandler.cs
index e356b0e..c977f3d 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultTaskRunningHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultTaskRunningHandler.cs
@@ -17,10 +17,10 @@
  * under the License.
  */
 
+using System;
 using Org.Apache.REEF.Driver.Task;
-using Org.Apache.REEF.Utilities.Logging;
 using Org.Apache.REEF.Tang.Annotations;
-using System;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Driver.Defaults
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultTaskSuspensionHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultTaskSuspensionHandler.cs b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultTaskSuspensionHandler.cs
index 9be7147..7d834cc 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultTaskSuspensionHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultTaskSuspensionHandler.cs
@@ -17,12 +17,11 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Common;
-using Org.Apache.REEF.Utilities.Diagnostics;
-using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Tang.Annotations;
 using System;
 using Org.Apache.REEF.Driver.Task;
+using Org.Apache.REEF.Tang.Annotations;
+using Org.Apache.REEF.Utilities.Diagnostics;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Driver.Defaults
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Driver/DriverConfigGenerator.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/DriverConfigGenerator.cs b/lang/cs/Org.Apache.REEF.Driver/DriverConfigGenerator.cs
index 407ce1a..ec4aa37 100644
--- a/lang/cs/Org.Apache.REEF.Driver/DriverConfigGenerator.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/DriverConfigGenerator.cs
@@ -21,12 +21,12 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using Org.Apache.REEF.Driver.Bridge;
-using Org.Apache.REEF.Utilities.Logging;
 using Org.Apache.REEF.Tang.Formats;
 using Org.Apache.REEF.Tang.Formats.AvroConfigurationDataContract;
 using Org.Apache.REEF.Tang.Implementations.Configuration;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Protobuf;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Driver
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Driver/DriverConfigurationSettings.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/DriverConfigurationSettings.cs b/lang/cs/Org.Apache.REEF.Driver/DriverConfigurationSettings.cs
index 98ec5ce..85cfacf 100644
--- a/lang/cs/Org.Apache.REEF.Driver/DriverConfigurationSettings.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/DriverConfigurationSettings.cs
@@ -18,7 +18,6 @@
  */
 
 using System;
-using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Driver
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Driver/DriverManager.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/DriverManager.cs b/lang/cs/Org.Apache.REEF.Driver/DriverManager.cs
index a54cf0c..ab416fc 100644
--- a/lang/cs/Org.Apache.REEF.Driver/DriverManager.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/DriverManager.cs
@@ -17,26 +17,24 @@
  * under the License.
  */
 
+using System;
+using System.Collections.Generic;
+using System.Globalization;
 using Org.Apache.REEF.Common;
 using Org.Apache.REEF.Common.Api;
 using Org.Apache.REEF.Common.Catalog;
 using Org.Apache.REEF.Common.Evaluator;
 using Org.Apache.REEF.Common.Exceptions;
-using Org.Apache.REEF.Driver.Bridge;
+using Org.Apache.REEF.Common.Protobuf.ReefProtocol;
 using Org.Apache.REEF.Driver.Evaluator;
+using Org.Apache.REEF.Tang.Implementations.InjectionPlan;
+using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Utilities;
 using Org.Apache.REEF.Utilities.Diagnostics;
 using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Tang.Implementations;
-using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Wake.Remote;
 using Org.Apache.REEF.Wake.Time;
 using Org.Apache.REEF.Wake.Time.Runtime.Event;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using Org.Apache.REEF.Common.Protobuf.ReefProtocol;
-using Org.Apache.REEF.Tang.Implementations.InjectionPlan;
 
 namespace Org.Apache.REEF.Driver
 {
@@ -52,25 +50,25 @@ namespace Org.Apache.REEF.Driver
     {
         private static readonly Logger LOGGER = Logger.GetLogger(typeof(DriverManager));
         
-        private IInjector _injector;
+        private readonly IInjector _injector;
 
-        private IInjectionFuture<IClock> _clockFuture; 
+        private readonly IInjectionFuture<IClock> _clockFuture; 
 
-        private ResourceCatalogImpl _resourceCatalog;
+        private readonly ResourceCatalogImpl _resourceCatalog;
 
         private IInjectionFuture<IResourceRequestHandler> _futureResourceRequestHandler;
         
-        private Dictionary<string, EvaluatorManager> _evaluators = new Dictionary<string, EvaluatorManager>();
+        private readonly Dictionary<string, EvaluatorManager> _evaluators = new Dictionary<string, EvaluatorManager>();
 
-        private EvaluatorHeartBeatSanityChecker _sanityChecker = new EvaluatorHeartBeatSanityChecker();
+        private readonly EvaluatorHeartBeatSanityChecker _sanityChecker = new EvaluatorHeartBeatSanityChecker();
 
-        private ClientJobStatusHandler _clientJobStatusHandler;
+        private readonly ClientJobStatusHandler _clientJobStatusHandler;
 
-        private IDisposable _heartbeatConnectionChannel;
+        private readonly IDisposable _heartbeatConnectionChannel;
 
-        private IDisposable _errorChannel;
+        private readonly IDisposable _errorChannel;
 
-        private IObserver<RuntimeErrorProto> _runtimeErrorHandler;
+        private readonly IObserver<RuntimeErrorProto> _runtimeErrorHandler;
 
         public DriverManager(
             IInjector injector,

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Driver/DriverRuntimeConfiguration.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/DriverRuntimeConfiguration.cs b/lang/cs/Org.Apache.REEF.Driver/DriverRuntimeConfiguration.cs
index 9bb92ed..641476f 100644
--- a/lang/cs/Org.Apache.REEF.Driver/DriverRuntimeConfiguration.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/DriverRuntimeConfiguration.cs
@@ -18,10 +18,7 @@
  */
 
 using Org.Apache.REEF.Common;
-using Org.Apache.REEF.Common.Api;
 using Org.Apache.REEF.Common.Catalog;
-using Org.Apache.REEF.Common.Evaluator;
-using Org.Apache.REEF.Driver.Evaluator;
 using Org.Apache.REEF.Tang.Formats;
 using Org.Apache.REEF.Tang.Util;
 

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Driver/Evaluator/EvaluatorDescriptorImpl.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Evaluator/EvaluatorDescriptorImpl.cs b/lang/cs/Org.Apache.REEF.Driver/Evaluator/EvaluatorDescriptorImpl.cs
index 0833431..e56f165 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Evaluator/EvaluatorDescriptorImpl.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Evaluator/EvaluatorDescriptorImpl.cs
@@ -17,15 +17,15 @@
  * under the License.
  */
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
 using Org.Apache.REEF.Common.Catalog;
 using Org.Apache.REEF.Common.Evaluator;
 using Org.Apache.REEF.Driver.Bridge;
 using Org.Apache.REEF.Utilities.Diagnostics;
 using Org.Apache.REEF.Utilities.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
 
 namespace Org.Apache.REEF.Driver.Evaluator
 {
@@ -41,7 +41,7 @@ namespace Org.Apache.REEF.Driver.Evaluator
 
         private int _virtualCore;
 
-        private string _rack = "default_rack";
+        private readonly string _rack = "default_rack";
 
         public EvaluatorDescriptorImpl(string serializedString)
         {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Driver/Evaluator/EvaluatorRequestBuilder.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Evaluator/EvaluatorRequestBuilder.cs b/lang/cs/Org.Apache.REEF.Driver/Evaluator/EvaluatorRequestBuilder.cs
index e51e799..d1b4864 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Evaluator/EvaluatorRequestBuilder.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Evaluator/EvaluatorRequestBuilder.cs
@@ -17,10 +17,9 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Common.Catalog.Capabilities;
-using Org.Apache.REEF.Common.Catalog;
-using Org.Apache.REEF.Driver.Bridge;
 using System.Collections.Generic;
+using Org.Apache.REEF.Common.Catalog;
+using Org.Apache.REEF.Common.Catalog.Capabilities;
 
 namespace Org.Apache.REEF.Driver.Evaluator
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Driver/Evaluator/IAllocatedEvaluator.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Evaluator/IAllocatedEvaluator.cs b/lang/cs/Org.Apache.REEF.Driver/Evaluator/IAllocatedEvaluator.cs
index 794987f..014ca44 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Evaluator/IAllocatedEvaluator.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Evaluator/IAllocatedEvaluator.cs
@@ -17,11 +17,10 @@
  * under the License.
  */
 
+using System;
 using Org.Apache.REEF.Common;
 using Org.Apache.REEF.Common.Evaluator;
 using Org.Apache.REEF.Utilities;
-using System;
-using System.Net;
 
 namespace Org.Apache.REEF.Driver.Evaluator
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Driver/Evaluator/IEvaluatorRequest .cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Evaluator/IEvaluatorRequest .cs b/lang/cs/Org.Apache.REEF.Driver/Evaluator/IEvaluatorRequest .cs
index 635c1f4..dcfd85b 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Evaluator/IEvaluatorRequest .cs	
+++ b/lang/cs/Org.Apache.REEF.Driver/Evaluator/IEvaluatorRequest .cs	
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Common.Catalog.Capabilities;
-using Org.Apache.REEF.Common.Catalog;
 using System.Collections.Generic;
+using Org.Apache.REEF.Common.Catalog;
+using Org.Apache.REEF.Common.Catalog.Capabilities;
 
 namespace Org.Apache.REEF.Driver.Evaluator
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Driver/Evaluator/IEvaluatorRequestor.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Evaluator/IEvaluatorRequestor.cs b/lang/cs/Org.Apache.REEF.Driver/Evaluator/IEvaluatorRequestor.cs
index ac374ce..63a1dda 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Evaluator/IEvaluatorRequestor.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Evaluator/IEvaluatorRequestor.cs
@@ -17,8 +17,6 @@
  * under the License.
  */
 
-using System.Collections.Generic;
-
 using Org.Apache.REEF.Common.Catalog;
 
 namespace Org.Apache.REEF.Driver.Evaluator

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Driver/Evaluator/IFailedEvaluator.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Evaluator/IFailedEvaluator.cs b/lang/cs/Org.Apache.REEF.Driver/Evaluator/IFailedEvaluator.cs
index d514e97..bce2937 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Evaluator/IFailedEvaluator.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Evaluator/IFailedEvaluator.cs
@@ -17,12 +17,11 @@
  * under the License.
  */
 
+using System.Collections.Generic;
 using Org.Apache.REEF.Common.Exceptions;
-using Org.Apache.REEF.Driver.Bridge;
+using Org.Apache.REEF.Driver.Bridge.Events;
 using Org.Apache.REEF.Driver.Task;
 using Org.Apache.REEF.Utilities;
-using System.Collections.Generic;
-using Org.Apache.REEF.Driver.Bridge.Events;
 
 namespace Org.Apache.REEF.Driver.Evaluator
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Driver/EvaluatorManager.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/EvaluatorManager.cs b/lang/cs/Org.Apache.REEF.Driver/EvaluatorManager.cs
index ed5c5ac..f3284e8 100644
--- a/lang/cs/Org.Apache.REEF.Driver/EvaluatorManager.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/EvaluatorManager.cs
@@ -17,27 +17,26 @@
  * under the License.
  */
 
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
 using Org.Apache.REEF.Common.Api;
 using Org.Apache.REEF.Common.Catalog;
 using Org.Apache.REEF.Common.Evaluator;
 using Org.Apache.REEF.Common.Exceptions;
-using Org.Apache.REEF.Driver.Bridge;
+using Org.Apache.REEF.Common.Protobuf.ReefProtocol;
+using Org.Apache.REEF.Driver.Bridge.Events;
 using Org.Apache.REEF.Driver.Context;
 using Org.Apache.REEF.Driver.Evaluator;
 using Org.Apache.REEF.Driver.Task;
+using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Utilities;
 using Org.Apache.REEF.Utilities.Diagnostics;
 using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Wake.Remote;
 using Org.Apache.REEF.Wake.Time;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using Org.Apache.REEF.Common.Protobuf.ReefProtocol;
-using Org.Apache.REEF.Driver.Bridge.Events;
 using TaskMessage = Org.Apache.REEF.Common.Tasks.TaskMessage;
 
 namespace Org.Apache.REEF.Driver
@@ -66,23 +65,23 @@ namespace Org.Apache.REEF.Driver
 
         // TODO
         //  private final RemoteManager remoteManager;
-        private DriverManager _driverManager;
+        private readonly DriverManager _driverManager;
 
-        private IResourceReleaseHandler _resourceReleaseHandler;
+        private readonly IResourceReleaseHandler _resourceReleaseHandler;
 
-        private IResourceLaunchHandler _resourceLaunchHandler;
+        private readonly IResourceLaunchHandler _resourceLaunchHandler;
 
-        private EvaluatorDescriptorImpl _evaluatorDescriptor;
+        private readonly EvaluatorDescriptorImpl _evaluatorDescriptor;
 
-        private string _evaluatorId;
+        private readonly string _evaluatorId;
 
-        private IList<EvaluatorContext> _activeContexts = new List<EvaluatorContext>();
+        private readonly IList<EvaluatorContext> _activeContexts = new List<EvaluatorContext>();
 
-        private HashSet<string> _activeContextIds = new HashSet<string>();
+        private readonly HashSet<string> _activeContextIds = new HashSet<string>();
 
         private IRunningTask _runningTask = null;
 
-        private IObserver<EvaluatorControlProto> _evaluatorControlHandler = null;
+        private readonly IObserver<EvaluatorControlProto> _evaluatorControlHandler = null;
 
         private bool _isResourceReleased = false;
 

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Driver/FailedJob.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/FailedJob.cs b/lang/cs/Org.Apache.REEF.Driver/FailedJob.cs
index 5f36437..eccb0c2 100644
--- a/lang/cs/Org.Apache.REEF.Driver/FailedJob.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/FailedJob.cs
@@ -17,9 +17,9 @@
  * under the License.
  */
 
+using System;
 using Org.Apache.REEF.Common.Api;
 using Org.Apache.REEF.Utilities;
-using System;
 
 namespace Org.Apache.REEF.Driver
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.csproj b/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.csproj
index 312d777..c50dab8 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.csproj
+++ b/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.csproj
@@ -32,23 +32,12 @@ under the License.
   </PropertyGroup>
   <Import Project="$(SolutionDir)\build.props" />
   <ItemGroup>
-    <Reference Include="Microsoft.Hadoop.Avro">
-      <HintPath>$(PackagesDir)\Microsoft.Hadoop.Avro.1.4.0.0\lib\net40\Microsoft.Hadoop.Avro.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>$(PackagesDir)\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="protobuf-net">
       <HintPath>$(PackagesDir)\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Bridge\BridgeLogger.cs" />
@@ -185,4 +174,4 @@ under the License.
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Driver/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Properties/AssemblyInfo.cs b/lang/cs/Org.Apache.REEF.Driver/Properties/AssemblyInfo.cs
index 79fba06..d25dc6f 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Properties/AssemblyInfo.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Properties/AssemblyInfo.cs
@@ -18,7 +18,6 @@
  */
 
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Driver/Task/IRunningTask.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Task/IRunningTask.cs b/lang/cs/Org.Apache.REEF.Driver/Task/IRunningTask.cs
index f1c4ea0..cba82dd 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Task/IRunningTask.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Task/IRunningTask.cs
@@ -17,9 +17,9 @@
  * under the License.
  */
 
+using System;
 using Org.Apache.REEF.Driver.Context;
 using Org.Apache.REEF.Utilities;
-using System;
 
 namespace Org.Apache.REEF.Driver.Task
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Driver/Task/RunningTaskImpl.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Task/RunningTaskImpl.cs b/lang/cs/Org.Apache.REEF.Driver/Task/RunningTaskImpl.cs
index abb771e..7486727 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Task/RunningTaskImpl.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Task/RunningTaskImpl.cs
@@ -17,11 +17,10 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Common;
-using Org.Apache.REEF.Driver.Context;
-using Org.Apache.REEF.Utilities.Logging;
 using System.Globalization;
 using Org.Apache.REEF.Common.Protobuf.ReefProtocol;
+using Org.Apache.REEF.Driver.Context;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Driver.Task
 {
@@ -29,11 +28,11 @@ namespace Org.Apache.REEF.Driver.Task
    {
        private static readonly Logger LOGGER = Logger.GetLogger(typeof(RunningTaskImpl));
        
-       private string _id;
+       private readonly string _id;
 
-       private EvaluatorManager _evaluatorManager;
+       private readonly EvaluatorManager _evaluatorManager;
 
-       private EvaluatorContext _evaluatorContext;
+       private readonly EvaluatorContext _evaluatorContext;
 
        public RunningTaskImpl(EvaluatorManager evaluatorManager, string taskId, EvaluatorContext evaluatorContext)
        {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Evaluator/Evaluator.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Evaluator/Evaluator.cs b/lang/cs/Org.Apache.REEF.Evaluator/Evaluator.cs
index 2709be0..99af164 100644
--- a/lang/cs/Org.Apache.REEF.Evaluator/Evaluator.cs
+++ b/lang/cs/Org.Apache.REEF.Evaluator/Evaluator.cs
@@ -17,19 +17,6 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Common;
-using Org.Apache.REEF.Common.Context;
-using Org.Apache.REEF.Driver.Bridge;
-using Org.Apache.REEF.Tang.Formats;
-using Org.Apache.REEF.Tang.Implementations.InjectionPlan;
-using Org.Apache.REEF.Tang.Implementations.Tang;
-using Org.Apache.REEF.Tang.Interface;
-using Org.Apache.REEF.Utilities;
-using Org.Apache.REEF.Utilities.Diagnostics;
-using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Wake.Remote;
-using Org.Apache.REEF.Wake.Remote.Impl;
-using Org.Apache.REEF.Wake.Time.Runtime.Event;
 using System;
 using System.Collections.Generic;
 using System.Configuration;
@@ -45,8 +32,18 @@ using Org.Apache.REEF.Common.Runtime.Evaluator.Context;
 using Org.Apache.REEF.Common.Runtime.Evaluator.Utils;
 using Org.Apache.REEF.Common.Services;
 using Org.Apache.REEF.Common.Tasks;
+using Org.Apache.REEF.Driver.Bridge;
+using Org.Apache.REEF.Tang.Formats;
+using Org.Apache.REEF.Tang.Implementations.InjectionPlan;
+using Org.Apache.REEF.Tang.Implementations.Tang;
+using Org.Apache.REEF.Tang.Interface;
+using Org.Apache.REEF.Utilities;
+using Org.Apache.REEF.Utilities.Diagnostics;
+using Org.Apache.REEF.Utilities.Logging;
+using Org.Apache.REEF.Wake.Remote;
+using Org.Apache.REEF.Wake.Remote.Impl;
 using Org.Apache.REEF.Wake.Time.Runtime;
-using Constants = Org.Apache.REEF.Common.Runtime.Evaluator.Constants;
+using Org.Apache.REEF.Wake.Time.Runtime.Event;
 
 namespace Org.Apache.REEF.Evaluator
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.csproj b/lang/cs/Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.csproj
index fa354bc..170effb 100644
--- a/lang/cs/Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.csproj
+++ b/lang/cs/Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.csproj
@@ -39,11 +39,6 @@ under the License.
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Evaluator.cs" />
@@ -88,4 +83,4 @@ under the License.
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Evaluator/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Evaluator/Properties/AssemblyInfo.cs b/lang/cs/Org.Apache.REEF.Evaluator/Properties/AssemblyInfo.cs
index 51ff356..9bcfde3 100644
--- a/lang/cs/Org.Apache.REEF.Evaluator/Properties/AssemblyInfo.cs
+++ b/lang/cs/Org.Apache.REEF.Evaluator/Properties/AssemblyInfo.cs
@@ -18,7 +18,6 @@
  */
 
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/AnotherHelloAllocatedEvaluatorHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/AnotherHelloAllocatedEvaluatorHandler.cs b/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/AnotherHelloAllocatedEvaluatorHandler.cs
index 3a1e847..2145d4c 100644
--- a/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/AnotherHelloAllocatedEvaluatorHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/AnotherHelloAllocatedEvaluatorHandler.cs
@@ -17,9 +17,9 @@
  * under the License.
  */
 
+using System;
 using Org.Apache.REEF.Driver.Evaluator;
 using Org.Apache.REEF.Tang.Annotations;
-using System;
 
 namespace Org.Apache.REEF.Examples.HelloCLRBridge.Handlers
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloActiveContextHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloActiveContextHandler.cs b/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloActiveContextHandler.cs
index c6c96e5..4bf8c47 100644
--- a/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloActiveContextHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloActiveContextHandler.cs
@@ -17,16 +17,15 @@
  * under the License.
  */
 
+using System;
+using System.Globalization;
+using Org.Apache.REEF.Common.Tasks;
 using Org.Apache.REEF.Driver.Context;
 using Org.Apache.REEF.Driver.Evaluator;
+using Org.Apache.REEF.Examples.Tasks.HelloTask;
 using Org.Apache.REEF.Tang.Annotations;
-using Org.Apache.REEF.Tang.Formats;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Util;
-using System;
-using System.Globalization;
-using Org.Apache.REEF.Examples.Tasks.HelloTask;
-using Org.Apache.REEF.Common.Tasks;
 
 namespace Org.Apache.REEF.Examples.HelloCLRBridge.Handlers
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloAllocatedEvaluatorHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloAllocatedEvaluatorHandler.cs b/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloAllocatedEvaluatorHandler.cs
index 9172b33..8b13426 100644
--- a/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloAllocatedEvaluatorHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloAllocatedEvaluatorHandler.cs
@@ -17,10 +17,18 @@
  * under the License.
  */
 
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Net;
 using Org.Apache.REEF.Common.Io;
+using Org.Apache.REEF.Common.Services;
+using Org.Apache.REEF.Common.Tasks;
 using Org.Apache.REEF.Driver.Bridge;
 using Org.Apache.REEF.Driver.Context;
 using Org.Apache.REEF.Driver.Evaluator;
+using Org.Apache.REEF.Examples.Tasks.HelloTask;
 using Org.Apache.REEF.Network.Naming;
 using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Tang.Implementations.Configuration;
@@ -28,14 +36,6 @@ using Org.Apache.REEF.Tang.Implementations.Tang;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Util;
 using Org.Apache.REEF.Utilities;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Net;
-using Org.Apache.REEF.Common.Services;
-using Org.Apache.REEF.Common.Tasks;
-using Org.Apache.REEF.Examples.Tasks.HelloTask;
 
 namespace Org.Apache.REEF.Examples.HelloCLRBridge.Handlers
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloCompletedEvaluatorHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloCompletedEvaluatorHandler.cs b/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloCompletedEvaluatorHandler.cs
index 7c4f650..c256a89 100644
--- a/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloCompletedEvaluatorHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloCompletedEvaluatorHandler.cs
@@ -17,13 +17,10 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Driver.Context;
-using Org.Apache.REEF.Driver.Evaluator;
-using Org.Apache.REEF.Driver.Task;
-using Org.Apache.REEF.Utilities;
-using Org.Apache.REEF.Tang.Annotations;
 using System;
 using System.Globalization;
+using Org.Apache.REEF.Driver.Evaluator;
+using Org.Apache.REEF.Tang.Annotations;
 
 namespace Org.Apache.REEF.Examples.HelloCLRBridge.Handlers
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloDriverRestartActiveContextHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloDriverRestartActiveContextHandler.cs b/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloDriverRestartActiveContextHandler.cs
index 9494f96..17f4074 100644
--- a/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloDriverRestartActiveContextHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloDriverRestartActiveContextHandler.cs
@@ -17,11 +17,11 @@
  * under the License.
  */
 
+using System;
+using System.Globalization;
 using Org.Apache.REEF.Driver.Context;
 using Org.Apache.REEF.Driver.Evaluator;
 using Org.Apache.REEF.Tang.Annotations;
-using System;
-using System.Globalization;
 
 namespace Org.Apache.REEF.Examples.HelloCLRBridge.Handlers
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloDriverRestartRunningTaskHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloDriverRestartRunningTaskHandler.cs b/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloDriverRestartRunningTaskHandler.cs
index d2d30cf..5250605 100644
--- a/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloDriverRestartRunningTaskHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloDriverRestartRunningTaskHandler.cs
@@ -21,8 +21,8 @@ using System;
 using System.Globalization;
 using Org.Apache.REEF.Driver.Context;
 using Org.Apache.REEF.Driver.Task;
-using Org.Apache.REEF.Utilities;
 using Org.Apache.REEF.Tang.Annotations;
+using Org.Apache.REEF.Utilities;
 
 namespace Org.Apache.REEF.Examples.HelloCLRBridge.Handlers
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloEvaluatorRequestorHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloEvaluatorRequestorHandler.cs b/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloEvaluatorRequestorHandler.cs
index 4f24e0f..c74c81a 100644
--- a/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloEvaluatorRequestorHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloEvaluatorRequestorHandler.cs
@@ -17,10 +17,8 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Driver.Bridge;
-using Org.Apache.REEF.Driver.Evaluator;
 using System;
-
+using Org.Apache.REEF.Driver.Evaluator;
 using Org.Apache.REEF.Tang.Annotations;
 
 namespace Org.Apache.REEF.Examples.HelloCLRBridge.Handlers

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloFailedEvaluatorHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloFailedEvaluatorHandler.cs b/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloFailedEvaluatorHandler.cs
index e9aa232..66290ef 100644
--- a/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloFailedEvaluatorHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloFailedEvaluatorHandler.cs
@@ -17,10 +17,9 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Driver.Bridge;
+using System;
 using Org.Apache.REEF.Driver.Evaluator;
 using Org.Apache.REEF.Tang.Annotations;
-using System;
 
 namespace Org.Apache.REEF.Examples.HelloCLRBridge.Handlers
 {
@@ -28,7 +27,7 @@ namespace Org.Apache.REEF.Examples.HelloCLRBridge.Handlers
     {
         private static int _failureCount = 0;
 
-        private static int _maxTrial = 2;
+        private static readonly int _maxTrial = 2;
 
         [Inject]
         public HelloFailedEvaluatorHandler()

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloFailedTaskHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloFailedTaskHandler.cs b/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloFailedTaskHandler.cs
index 7618f00..49b10c1 100644
--- a/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloFailedTaskHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloFailedTaskHandler.cs
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Driver.Task;
-using Org.Apache.REEF.Utilities;
-using Org.Apache.REEF.Tang.Annotations;
 using System;
 using System.Globalization;
+using Org.Apache.REEF.Driver.Task;
+using Org.Apache.REEF.Tang.Annotations;
+using Org.Apache.REEF.Utilities;
 
 namespace Org.Apache.REEF.Examples.HelloCLRBridge.Handlers
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloHttpHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloHttpHandler.cs b/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloHttpHandler.cs
index e1bf097..ca1a810 100644
--- a/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloHttpHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloHttpHandler.cs
@@ -20,9 +20,9 @@
 using System.Globalization;
 using System.Net;
 using Org.Apache.REEF.Driver.Bridge;
+using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Utilities;
 using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Tang.Annotations;
 
 namespace Org.Apache.REEF.Examples.HelloCLRBridge.Handlers
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloRestartHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloRestartHandler.cs b/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloRestartHandler.cs
index a5ad24b..5ce86a2 100644
--- a/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloRestartHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloRestartHandler.cs
@@ -17,9 +17,8 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Tang.Annotations;
-using Org.Apache.REEF.Wake.Time;
 using System;
+using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Wake.Time.Event;
 
 namespace Org.Apache.REEF.Examples.HelloCLRBridge.Handlers

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloRunningTaskHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloRunningTaskHandler.cs b/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloRunningTaskHandler.cs
index 07048e4..404164d 100644
--- a/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloRunningTaskHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloRunningTaskHandler.cs
@@ -21,8 +21,8 @@ using System;
 using System.Globalization;
 using Org.Apache.REEF.Driver.Context;
 using Org.Apache.REEF.Driver.Task;
-using Org.Apache.REEF.Utilities;
 using Org.Apache.REEF.Tang.Annotations;
+using Org.Apache.REEF.Utilities;
 
 namespace Org.Apache.REEF.Examples.HelloCLRBridge.Handlers
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloSimpleEventHandlers.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloSimpleEventHandlers.cs b/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloSimpleEventHandlers.cs
index bab6898..f54a1d9 100644
--- a/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloSimpleEventHandlers.cs
+++ b/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloSimpleEventHandlers.cs
@@ -20,10 +20,8 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
 using System.Net;
 using System.Text;
-using System.Threading.Tasks;
 using Org.Apache.REEF.Common.Io;
 using Org.Apache.REEF.Common.Tasks;
 using Org.Apache.REEF.Driver;
@@ -33,11 +31,11 @@ using Org.Apache.REEF.Driver.Evaluator;
 using Org.Apache.REEF.Driver.Task;
 using Org.Apache.REEF.Examples.Tasks.HelloTask;
 using Org.Apache.REEF.Network.Naming;
-using Org.Apache.REEF.Utilities;
-using Org.Apache.REEF.Utilities.Logging;
 using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Util;
+using Org.Apache.REEF.Utilities;
+using Org.Apache.REEF.Utilities.Logging;
 using IRunningTask = Org.Apache.REEF.Driver.Task.IRunningTask;
 
 namespace Org.Apache.REEF.Examples.HelloCLRBridge.Handlers
@@ -77,7 +75,7 @@ namespace Org.Apache.REEF.Examples.HelloCLRBridge.Handlers
         private static readonly Logger LOGGER = Logger.GetLogger(typeof(HelloSimpleEventHandlers));
         private IAllocatedEvaluator _allocatedEvaluator;
         private IActiveContext _activeContext;
-        private IList<IActiveContext> _activeContexts = new List<IActiveContext>();
+        private readonly IList<IActiveContext> _activeContexts = new List<IActiveContext>();
         private DriverStatus driveStatus;
         private TaskContext _taskContext;
 
@@ -354,9 +352,9 @@ namespace Org.Apache.REEF.Examples.HelloCLRBridge.Handlers
 
     class TaskContext
     {
-        private IList<string> taskIds = new List<string>();
+        private readonly IList<string> taskIds = new List<string>();
 
-        private IDictionary<string, TaskStatus> tasks = new Dictionary<string, TaskStatus>();
+        private readonly IDictionary<string, TaskStatus> tasks = new Dictionary<string, TaskStatus>();
 
         public TaskContext()
         {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloStartHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloStartHandler.cs b/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloStartHandler.cs
index 04f0a79..0d8fc55 100644
--- a/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloStartHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/Handlers/HelloStartHandler.cs
@@ -24,8 +24,8 @@ using Org.Apache.REEF.Driver;
 using Org.Apache.REEF.Driver.Bridge;
 using Org.Apache.REEF.Examples.Tasks.HelloTask;
 using Org.Apache.REEF.Network.Naming;
-using Org.Apache.REEF.Utilities.Logging;
 using Org.Apache.REEF.Tang.Annotations;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Examples.HelloCLRBridge.Handlers
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/HelloTraceListener.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/HelloTraceListener.cs b/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/HelloTraceListener.cs
index 88dbe3b..9dc01b7 100644
--- a/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/HelloTraceListener.cs
+++ b/lang/cs/Org.Apache.REEF.Examples/HelloCLRBridge/HelloTraceListener.cs
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Tang.Annotations;
 using System.Diagnostics;
+using Org.Apache.REEF.Tang.Annotations;
 
 namespace Org.Apache.REEF.Examples.HelloCLRBridge
 {
@@ -27,7 +27,7 @@ namespace Org.Apache.REEF.Examples.HelloCLRBridge
     /// </summary>
     public class HelloTraceListener : TraceListener
     {
-        private TraceListener _listener;
+        private readonly TraceListener _listener;
 
         [Inject]
         public HelloTraceListener()

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Examples/MachineLearning/KMeans/KMeansDriverHandlers.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Examples/MachineLearning/KMeans/KMeansDriverHandlers.cs b/lang/cs/Org.Apache.REEF.Examples/MachineLearning/KMeans/KMeansDriverHandlers.cs
index 235a268..66c16bd 100644
--- a/lang/cs/Org.Apache.REEF.Examples/MachineLearning/KMeans/KMeansDriverHandlers.cs
+++ b/lang/cs/Org.Apache.REEF.Examples/MachineLearning/KMeans/KMeansDriverHandlers.cs
@@ -53,16 +53,16 @@ namespace Org.Apache.REEF.Examples.MachineLearning.KMeans
     {
         private static readonly Logger _Logger = Logger.GetLogger(typeof(KMeansDriverHandlers));
         private readonly object _lockObj = new object();
-        private string _executionDirectory;
+        private readonly string _executionDirectory;
 
         // TODO: we may want to make this injectable
-        private int _partitionsNumber = 2;
-        private int _clustersNumber = 3;
-        private int _totalEvaluators;
+        private readonly int _partitionsNumber = 2;
+        private readonly int _clustersNumber = 3;
+        private readonly int _totalEvaluators;
         private int _partitionInex = 0;
-        private IMpiDriver _mpiDriver;
-        private ICommunicationGroupDriver _commGroup;
-        private TaskStarter _mpiTaskStarter;
+        private readonly IMpiDriver _mpiDriver;
+        private readonly ICommunicationGroupDriver _commGroup;
+        private readonly TaskStarter _mpiTaskStarter;
 
         [Inject]
         public KMeansDriverHandlers()

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Examples/MachineLearning/KMeans/KMeansMasterTask.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Examples/MachineLearning/KMeans/KMeansMasterTask.cs b/lang/cs/Org.Apache.REEF.Examples/MachineLearning/KMeans/KMeansMasterTask.cs
index 3dd7adb..fd096ea 100644
--- a/lang/cs/Org.Apache.REEF.Examples/MachineLearning/KMeans/KMeansMasterTask.cs
+++ b/lang/cs/Org.Apache.REEF.Examples/MachineLearning/KMeans/KMeansMasterTask.cs
@@ -33,15 +33,15 @@ namespace Org.Apache.REEF.Examples.MachineLearning.KMeans
 {
     public class KMeansMasterTask : ITask
     {
-        private static Logger _logger = Logger.GetLogger(typeof(KMeansMasterTask));
+        private static readonly Logger _logger = Logger.GetLogger(typeof(KMeansMasterTask));
 
         private int _iteration = 0;
 
-        private ICommunicationGroupClient _commGroup;
-        private IBroadcastSender<Centroids> _dataBroadcastSender;
-        private IBroadcastSender<ControlMessage> _controlBroadcastSender;
-        private IReduceReceiver<ProcessedResults> _meansReducerReceiver;
-        private string _kMeansExecutionDirectory;
+        private readonly ICommunicationGroupClient _commGroup;
+        private readonly IBroadcastSender<Centroids> _dataBroadcastSender;
+        private readonly IBroadcastSender<ControlMessage> _controlBroadcastSender;
+        private readonly IReduceReceiver<ProcessedResults> _meansReducerReceiver;
+        private readonly string _kMeansExecutionDirectory;
         private Centroids _centroids;
         private bool _isInitialIteration;
 

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Examples/MachineLearning/KMeans/KMeansSlaveTask.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Examples/MachineLearning/KMeans/KMeansSlaveTask.cs b/lang/cs/Org.Apache.REEF.Examples/MachineLearning/KMeans/KMeansSlaveTask.cs
index a36fbcb..8d45245 100644
--- a/lang/cs/Org.Apache.REEF.Examples/MachineLearning/KMeans/KMeansSlaveTask.cs
+++ b/lang/cs/Org.Apache.REEF.Examples/MachineLearning/KMeans/KMeansSlaveTask.cs
@@ -30,14 +30,14 @@ namespace Org.Apache.REEF.Examples.MachineLearning.KMeans
 {
     public class KMeansSlaveTask : ITask
     {
-        private static Logger _logger = Logger.GetLogger(typeof(KMeansSlaveTask));
-        private int _clustersNum;
-        private IMpiClient _mpiClient;
-        private ICommunicationGroupClient _commGroup;
-        private IBroadcastReceiver<Centroids> _dataBroadcastReceiver;
-        private IBroadcastReceiver<ControlMessage> _controlBroadcastReceiver;
-        private IReduceSender<ProcessedResults> _partialMeansSender;
-        private DataPartitionCache _dataPartition;
+        private static readonly Logger _logger = Logger.GetLogger(typeof(KMeansSlaveTask));
+        private readonly int _clustersNum;
+        private readonly IMpiClient _mpiClient;
+        private readonly ICommunicationGroupClient _commGroup;
+        private readonly IBroadcastReceiver<Centroids> _dataBroadcastReceiver;
+        private readonly IBroadcastReceiver<ControlMessage> _controlBroadcastReceiver;
+        private readonly IReduceSender<ProcessedResults> _partialMeansSender;
+        private readonly DataPartitionCache _dataPartition;
 
         [Inject]
         public KMeansSlaveTask(

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Examples/MachineLearning/KMeans/LegacyKMeansTask.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Examples/MachineLearning/KMeans/LegacyKMeansTask.cs b/lang/cs/Org.Apache.REEF.Examples/MachineLearning/KMeans/LegacyKMeansTask.cs
index b674d84..c6c3ffa 100644
--- a/lang/cs/Org.Apache.REEF.Examples/MachineLearning/KMeans/LegacyKMeansTask.cs
+++ b/lang/cs/Org.Apache.REEF.Examples/MachineLearning/KMeans/LegacyKMeansTask.cs
@@ -31,9 +31,9 @@ namespace Org.Apache.REEF.Examples.MachineLearning.KMeans
     /// </summary>
     public class LegacyKMeansTask
     {
-        private int _clustersNum;
-        private DataPartitionCache _dataPartition;
-        private string _kMeansExecutionDirectory;
+        private readonly int _clustersNum;
+        private readonly DataPartitionCache _dataPartition;
+        private readonly string _kMeansExecutionDirectory;
 
         private Centroids _centroids;
         private List<PartialMean> _partialMeans;

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Examples/Org.Apache.REEF.Examples.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Examples/Org.Apache.REEF.Examples.csproj b/lang/cs/Org.Apache.REEF.Examples/Org.Apache.REEF.Examples.csproj
index 0e87b3b..e612ea6 100644
--- a/lang/cs/Org.Apache.REEF.Examples/Org.Apache.REEF.Examples.csproj
+++ b/lang/cs/Org.Apache.REEF.Examples/Org.Apache.REEF.Examples.csproj
@@ -38,11 +38,6 @@ under the License.
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="HelloCLRBridge\Handlers\AnotherHelloAllocatedEvaluatorHandler.cs" />
@@ -126,4 +121,4 @@ under the License.
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Examples/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Examples/Properties/AssemblyInfo.cs b/lang/cs/Org.Apache.REEF.Examples/Properties/AssemblyInfo.cs
index fba805a..6866f17 100644
--- a/lang/cs/Org.Apache.REEF.Examples/Properties/AssemblyInfo.cs
+++ b/lang/cs/Org.Apache.REEF.Examples/Properties/AssemblyInfo.cs
@@ -18,7 +18,6 @@
  */
 
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Examples/RetainedEvalCLRBridge/Handlers/RetainedEvalEvaluatorRequestorHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Examples/RetainedEvalCLRBridge/Handlers/RetainedEvalEvaluatorRequestorHandler.cs b/lang/cs/Org.Apache.REEF.Examples/RetainedEvalCLRBridge/Handlers/RetainedEvalEvaluatorRequestorHandler.cs
index 2bff930..172cd4e 100644
--- a/lang/cs/Org.Apache.REEF.Examples/RetainedEvalCLRBridge/Handlers/RetainedEvalEvaluatorRequestorHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Examples/RetainedEvalCLRBridge/Handlers/RetainedEvalEvaluatorRequestorHandler.cs
@@ -18,7 +18,6 @@
  */
 
 using System;
-using Org.Apache.REEF.Driver.Bridge;
 using Org.Apache.REEF.Driver.Evaluator;
 
 namespace Org.Apache.REEF.Examples.RetainedEvalCLRBridge.Handlers

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Examples/Tasks/HelloTask/HelloService.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Examples/Tasks/HelloTask/HelloService.cs b/lang/cs/Org.Apache.REEF.Examples/Tasks/HelloTask/HelloService.cs
index e12bf40..0356e75 100644
--- a/lang/cs/Org.Apache.REEF.Examples/Tasks/HelloTask/HelloService.cs
+++ b/lang/cs/Org.Apache.REEF.Examples/Tasks/HelloTask/HelloService.cs
@@ -26,7 +26,7 @@ namespace Org.Apache.REEF.Examples.Tasks.HelloTask
 {
     public class HelloService : IService
     {
-        private IList<string> _guests;
+        private readonly IList<string> _guests;
 
         [Inject]
         public HelloService()

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Examples/Tasks/HelloTask/HelloTask.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Examples/Tasks/HelloTask/HelloTask.cs b/lang/cs/Org.Apache.REEF.Examples/Tasks/HelloTask/HelloTask.cs
index 217d22e..ccfeb01 100644
--- a/lang/cs/Org.Apache.REEF.Examples/Tasks/HelloTask/HelloTask.cs
+++ b/lang/cs/Org.Apache.REEF.Examples/Tasks/HelloTask/HelloTask.cs
@@ -34,7 +34,7 @@ namespace Org.Apache.REEF.Examples.Tasks.HelloTask
     {
         private static readonly Logger LOGGER = Logger.GetLogger(typeof(HelloTask));
 
-        private INameClient _nameClient = null;
+        private readonly INameClient _nameClient = null;
 
         [Inject]
         public HelloTask()
@@ -101,7 +101,7 @@ namespace Org.Apache.REEF.Examples.Tasks.HelloTask
 
         public class HelloDriverMessageHandler : IDriverMessageHandler
         {
-            private HelloTask _parentTask;
+            private readonly HelloTask _parentTask;
 
             [Inject]
             public HelloDriverMessageHandler(HelloTask task)

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Examples/Tasks/StreamingTasks/StreamTask1.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Examples/Tasks/StreamingTasks/StreamTask1.cs b/lang/cs/Org.Apache.REEF.Examples/Tasks/StreamingTasks/StreamTask1.cs
index def85dc..a594f24 100644
--- a/lang/cs/Org.Apache.REEF.Examples/Tasks/StreamingTasks/StreamTask1.cs
+++ b/lang/cs/Org.Apache.REEF.Examples/Tasks/StreamingTasks/StreamTask1.cs
@@ -25,7 +25,7 @@ namespace Org.Apache.REEF.Examples.Tasks.StreamingTasks
 {
     public class StreamTask1 : ITask
     {
-        private string _ipAddress;
+        private readonly string _ipAddress;
 
         [Inject]
         public StreamTask1([Parameter(typeof(IpAddress))] string ipAddress)

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Codec/GcmMessageProto.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Codec/GcmMessageProto.cs b/lang/cs/Org.Apache.REEF.Network/Group/Codec/GcmMessageProto.cs
index 8a5a726..755851a 100644
--- a/lang/cs/Org.Apache.REEF.Network/Group/Codec/GcmMessageProto.cs
+++ b/lang/cs/Org.Apache.REEF.Network/Group/Codec/GcmMessageProto.cs
@@ -17,12 +17,6 @@
  * under the License.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Org.Apache.REEF.Network.Group.Driver;
 using Org.Apache.REEF.Network.Group.Driver.Impl;
 using ProtoBuf;
 

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Codec/GroupCommunicationMessageCodec.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Codec/GroupCommunicationMessageCodec.cs b/lang/cs/Org.Apache.REEF.Network/Group/Codec/GroupCommunicationMessageCodec.cs
index a8f884f..081804f 100644
--- a/lang/cs/Org.Apache.REEF.Network/Group/Codec/GroupCommunicationMessageCodec.cs
+++ b/lang/cs/Org.Apache.REEF.Network/Group/Codec/GroupCommunicationMessageCodec.cs
@@ -17,14 +17,7 @@
  * under the License.
  */
 
-using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Org.Apache.REEF.Network.Group.Codec;
-using Org.Apache.REEF.Network.Group.Driver;
 using Org.Apache.REEF.Network.Group.Driver.Impl;
 using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Wake.Remote;

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Config/MpiConfigurationOptions.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Config/MpiConfigurationOptions.cs b/lang/cs/Org.Apache.REEF.Network/Group/Config/MpiConfigurationOptions.cs
index 423e916..db96205 100644
--- a/lang/cs/Org.Apache.REEF.Network/Group/Config/MpiConfigurationOptions.cs
+++ b/lang/cs/Org.Apache.REEF.Network/Group/Config/MpiConfigurationOptions.cs
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Org.Apache.REEF.Tang.Annotations;
 
 namespace Org.Apache.REEF.Network.Group.Config

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Driver/ICommunicationGroupDriver.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Driver/ICommunicationGroupDriver.cs b/lang/cs/Org.Apache.REEF.Network/Group/Driver/ICommunicationGroupDriver.cs
index a2a249d..0d41209 100644
--- a/lang/cs/Org.Apache.REEF.Network/Group/Driver/ICommunicationGroupDriver.cs
+++ b/lang/cs/Org.Apache.REEF.Network/Group/Driver/ICommunicationGroupDriver.cs
@@ -17,10 +17,9 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Network.Group.Operators;
+using System.Collections.Generic;
 using Org.Apache.REEF.Network.Group.Operators.Impl;
 using Org.Apache.REEF.Tang.Interface;
-using System.Collections.Generic;
 
 namespace Org.Apache.REEF.Network.Group.Driver
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Driver/Impl/CommunicationGroupDriver.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Driver/Impl/CommunicationGroupDriver.cs b/lang/cs/Org.Apache.REEF.Network/Group/Driver/Impl/CommunicationGroupDriver.cs
index d29c504..5b57d9e 100644
--- a/lang/cs/Org.Apache.REEF.Network/Group/Driver/Impl/CommunicationGroupDriver.cs
+++ b/lang/cs/Org.Apache.REEF.Network/Group/Driver/Impl/CommunicationGroupDriver.cs
@@ -17,19 +17,17 @@
  * under the License.
  */
 
+using System.Collections.Generic;
+using System.Reflection;
 using Org.Apache.REEF.Network.Group.Config;
 using Org.Apache.REEF.Network.Group.Operators.Impl;
 using Org.Apache.REEF.Network.Group.Topology;
-using Org.Apache.REEF.Network.Utilities;
-using Org.Apache.REEF.Utilities.Logging;
 using Org.Apache.REEF.Tang.Exceptions;
 using Org.Apache.REEF.Tang.Formats;
-using Org.Apache.REEF.Tang.Implementations;
+using Org.Apache.REEF.Tang.Implementations.Tang;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Util;
-using System.Collections.Generic;
-using System.Reflection;
-using Org.Apache.REEF.Tang.Implementations.Tang;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Network.Group.Driver.Impl
 {
@@ -42,17 +40,17 @@ namespace Org.Apache.REEF.Network.Group.Driver.Impl
     {
         private static readonly Logger LOGGER = Logger.GetLogger(typeof(CommunicationGroupDriver));
 
-        private string _groupName;
-        private string _driverId;
-        private int _numTasks;
+        private readonly string _groupName;
+        private readonly string _driverId;
+        private readonly int _numTasks;
         private int _tasksAdded;
         private bool _finalized;
 
-        private AvroConfigurationSerializer _confSerializer;
+        private readonly AvroConfigurationSerializer _confSerializer;
 
-        private object _topologyLock;
-        private Dictionary<string, object> _operatorSpecs;
-        private Dictionary<string, object> _topologies;
+        private readonly object _topologyLock;
+        private readonly Dictionary<string, object> _operatorSpecs;
+        private readonly Dictionary<string, object> _topologies;
 
         /// <summary>
         /// Create a new CommunicationGroupDriver.

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Driver/Impl/MpiDriver.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Driver/Impl/MpiDriver.cs b/lang/cs/Org.Apache.REEF.Network/Group/Driver/Impl/MpiDriver.cs
index a373ef3..52eec91 100644
--- a/lang/cs/Org.Apache.REEF.Network/Group/Driver/Impl/MpiDriver.cs
+++ b/lang/cs/Org.Apache.REEF.Network/Group/Driver/Impl/MpiDriver.cs
@@ -30,12 +30,12 @@ using Org.Apache.REEF.Network.Group.Config;
 using Org.Apache.REEF.Network.Group.Task.Impl;
 using Org.Apache.REEF.Network.Naming;
 using Org.Apache.REEF.Network.NetworkService;
-using Org.Apache.REEF.Utilities.Logging;
 using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Tang.Formats;
 using Org.Apache.REEF.Tang.Implementations.Tang;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Util;
+using Org.Apache.REEF.Utilities.Logging;
 using Org.Apache.REEF.Wake.Remote;
 
 namespace Org.Apache.REEF.Network.Group.Driver.Impl
@@ -51,14 +51,14 @@ namespace Org.Apache.REEF.Network.Group.Driver.Impl
 
         private static Logger LOGGER = Logger.GetLogger(typeof(MpiDriver));
 
-        private string _driverId;
-        private string _nameServerAddr;
-        private int _nameServerPort;
+        private readonly string _driverId;
+        private readonly string _nameServerAddr;
+        private readonly int _nameServerPort;
         private int _contextIds;
 
-        private Dictionary<string, ICommunicationGroupDriver> _commGroups; 
-        private AvroConfigurationSerializer _configSerializer;
-        private NameServer _nameServer;
+        private readonly Dictionary<string, ICommunicationGroupDriver> _commGroups; 
+        private readonly AvroConfigurationSerializer _configSerializer;
+        private readonly NameServer _nameServer;
 
         /// <summary>
         /// Create a new MpiDriver object.

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Driver/Impl/TaskStarter.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Driver/Impl/TaskStarter.cs b/lang/cs/Org.Apache.REEF.Network/Group/Driver/Impl/TaskStarter.cs
index 48463dc..ab947f0 100644
--- a/lang/cs/Org.Apache.REEF.Network/Group/Driver/Impl/TaskStarter.cs
+++ b/lang/cs/Org.Apache.REEF.Network/Group/Driver/Impl/TaskStarter.cs
@@ -23,9 +23,9 @@ using System.Linq;
 using System.Threading;
 using Org.Apache.REEF.Driver.Context;
 using Org.Apache.REEF.Network.Utilities;
-using Org.Apache.REEF.Utilities.Logging;
 using Org.Apache.REEF.Tang.Implementations.Configuration;
 using Org.Apache.REEF.Tang.Interface;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Network.Group.Driver.Impl
 {
@@ -34,15 +34,15 @@ namespace Org.Apache.REEF.Network.Group.Driver.Impl
     /// </summary>
     public class TaskStarter
     {
-        private static Logger LOGGER = Logger.GetLogger(typeof(TaskStarter));
+        private static readonly Logger LOGGER = Logger.GetLogger(typeof(TaskStarter));
 
-        private object _lock;
-        private int _numTasks;
+        private readonly object _lock;
+        private readonly int _numTasks;
         private int _tasksAdded;
-        private string _masterTaskId;
+        private readonly string _masterTaskId;
 
-        private IMpiDriver _mpiDriver;
-        private List<Tuple<string, IConfiguration, IActiveContext>> _taskTuples; 
+        private readonly IMpiDriver _mpiDriver;
+        private readonly List<Tuple<string, IConfiguration, IActiveContext>> _taskTuples; 
 
         /// <summary>
         /// Create new TaskStarter.

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Operators/IBroadcastReceiver.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Operators/IBroadcastReceiver.cs b/lang/cs/Org.Apache.REEF.Network/Group/Operators/IBroadcastReceiver.cs
index 09c8c30..6e2fc68 100644
--- a/lang/cs/Org.Apache.REEF.Network/Group/Operators/IBroadcastReceiver.cs
+++ b/lang/cs/Org.Apache.REEF.Network/Group/Operators/IBroadcastReceiver.cs
@@ -17,12 +17,6 @@
  * under the License.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace Org.Apache.REEF.Network.Group.Operators
 {
     /// <summary>

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Operators/IBroadcastSender.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Operators/IBroadcastSender.cs b/lang/cs/Org.Apache.REEF.Network/Group/Operators/IBroadcastSender.cs
index 534fa9f..f62702d 100644
--- a/lang/cs/Org.Apache.REEF.Network/Group/Operators/IBroadcastSender.cs
+++ b/lang/cs/Org.Apache.REEF.Network/Group/Operators/IBroadcastSender.cs
@@ -17,12 +17,6 @@
  * under the License.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace Org.Apache.REEF.Network.Group.Operators
 {
     /// <summary>

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Operators/IMpiOperator.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Operators/IMpiOperator.cs b/lang/cs/Org.Apache.REEF.Network/Group/Operators/IMpiOperator.cs
index 661f348..58ad1b2 100644
--- a/lang/cs/Org.Apache.REEF.Network/Group/Operators/IMpiOperator.cs
+++ b/lang/cs/Org.Apache.REEF.Network/Group/Operators/IMpiOperator.cs
@@ -17,12 +17,6 @@
  * under the License.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace Org.Apache.REEF.Network.Group.Operators
 {
     /// <summary>

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Operators/IOperatorSpec.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Operators/IOperatorSpec.cs b/lang/cs/Org.Apache.REEF.Network/Group/Operators/IOperatorSpec.cs
index 5d18677..b1c119c 100644
--- a/lang/cs/Org.Apache.REEF.Network/Group/Operators/IOperatorSpec.cs
+++ b/lang/cs/Org.Apache.REEF.Network/Group/Operators/IOperatorSpec.cs
@@ -17,8 +17,6 @@
  * under the License.
  */
 
-using System;
-using Org.Apache.REEF.Tang.Util;
 using Org.Apache.REEF.Wake.Remote;
 
 namespace Org.Apache.REEF.Network.Group.Operators

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Operators/IReduceFunction.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Operators/IReduceFunction.cs b/lang/cs/Org.Apache.REEF.Network/Group/Operators/IReduceFunction.cs
index 020b09a..1c625fc 100644
--- a/lang/cs/Org.Apache.REEF.Network/Group/Operators/IReduceFunction.cs
+++ b/lang/cs/Org.Apache.REEF.Network/Group/Operators/IReduceFunction.cs
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Org.Apache.REEF.Network.Group.Operators
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Operators/IReduceReceiver.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Operators/IReduceReceiver.cs b/lang/cs/Org.Apache.REEF.Network/Group/Operators/IReduceReceiver.cs
index 2305968..64f366a 100644
--- a/lang/cs/Org.Apache.REEF.Network/Group/Operators/IReduceReceiver.cs
+++ b/lang/cs/Org.Apache.REEF.Network/Group/Operators/IReduceReceiver.cs
@@ -17,12 +17,6 @@
  * under the License.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace Org.Apache.REEF.Network.Group.Operators
 {
     /// <summary>

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Operators/IReduceSender.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Operators/IReduceSender.cs b/lang/cs/Org.Apache.REEF.Network/Group/Operators/IReduceSender.cs
index c15ded6..e7ebf3c 100644
--- a/lang/cs/Org.Apache.REEF.Network/Group/Operators/IReduceSender.cs
+++ b/lang/cs/Org.Apache.REEF.Network/Group/Operators/IReduceSender.cs
@@ -17,12 +17,6 @@
  * under the License.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace Org.Apache.REEF.Network.Group.Operators
 {
     /// <summary>

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Operators/IScatterReceiver.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Operators/IScatterReceiver.cs b/lang/cs/Org.Apache.REEF.Network/Group/Operators/IScatterReceiver.cs
index 7aa4e81..204ea88 100644
--- a/lang/cs/Org.Apache.REEF.Network/Group/Operators/IScatterReceiver.cs
+++ b/lang/cs/Org.Apache.REEF.Network/Group/Operators/IScatterReceiver.cs
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Org.Apache.REEF.Network.Group.Operators
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Operators/IScatterSender.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Operators/IScatterSender.cs b/lang/cs/Org.Apache.REEF.Network/Group/Operators/IScatterSender.cs
index c5a2c3d..2b020a5 100644
--- a/lang/cs/Org.Apache.REEF.Network/Group/Operators/IScatterSender.cs
+++ b/lang/cs/Org.Apache.REEF.Network/Group/Operators/IScatterSender.cs
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Org.Apache.REEF.Network.Group.Operators
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/BroadcastReceiver.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/BroadcastReceiver.cs b/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/BroadcastReceiver.cs
index 4374ab5..92821c8 100644
--- a/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/BroadcastReceiver.cs
+++ b/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/BroadcastReceiver.cs
@@ -17,13 +17,12 @@
  * under the License.
  */
 
+using System.Reactive;
 using Org.Apache.REEF.Network.Group.Config;
-using Org.Apache.REEF.Network.Group.Driver;
 using Org.Apache.REEF.Network.Group.Driver.Impl;
 using Org.Apache.REEF.Network.Group.Task;
 using Org.Apache.REEF.Network.Group.Task.Impl;
 using Org.Apache.REEF.Tang.Annotations;
-using System.Reactive;
 
 namespace Org.Apache.REEF.Network.Group.Operators.Impl
 {
@@ -35,8 +34,8 @@ namespace Org.Apache.REEF.Network.Group.Operators.Impl
     {
         private const int DefaultVersion = 1;
 
-        private ICommunicationGroupNetworkObserver _networkHandler;
-        private OperatorTopology<T> _topology;
+        private readonly ICommunicationGroupNetworkObserver _networkHandler;
+        private readonly OperatorTopology<T> _topology;
 
         /// <summary>
         /// Creates a new BroadcastReceiver.

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/BroadcastSender.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/BroadcastSender.cs b/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/BroadcastSender.cs
index 4e48428..f88b093 100644
--- a/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/BroadcastSender.cs
+++ b/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/BroadcastSender.cs
@@ -17,14 +17,13 @@
  * under the License.
  */
 
+using System;
+using System.Reactive;
 using Org.Apache.REEF.Network.Group.Config;
-using Org.Apache.REEF.Network.Group.Driver;
 using Org.Apache.REEF.Network.Group.Driver.Impl;
 using Org.Apache.REEF.Network.Group.Task;
 using Org.Apache.REEF.Network.Group.Task.Impl;
 using Org.Apache.REEF.Tang.Annotations;
-using System;
-using System.Reactive;
 
 namespace Org.Apache.REEF.Network.Group.Operators.Impl
 {
@@ -36,8 +35,8 @@ namespace Org.Apache.REEF.Network.Group.Operators.Impl
     {
         private const int DefaultVersion = 1;
 
-        private ICommunicationGroupNetworkObserver _networkHandler;
-        private OperatorTopology<T> _topology;
+        private readonly ICommunicationGroupNetworkObserver _networkHandler;
+        private readonly OperatorTopology<T> _topology;
             
         /// <summary>
         /// Creates a new BroadcastSender to send messages to other Tasks.

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/ReduceFunction.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/ReduceFunction.cs b/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/ReduceFunction.cs
index bc60055..89640c6 100644
--- a/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/ReduceFunction.cs
+++ b/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/ReduceFunction.cs
@@ -25,8 +25,8 @@ namespace Org.Apache.REEF.Network.Group.Operators.Impl
 {
     public class ReduceFunction<T> : IReduceFunction<T>
     {
-        private Func<T, T, T> _reduceFunction;
-        private T _initialValue;
+        private readonly Func<T, T, T> _reduceFunction;
+        private readonly T _initialValue;
  
         private ReduceFunction(Func<T, T, T> reduceFunction)
         {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/ReduceReceiver.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/ReduceReceiver.cs b/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/ReduceReceiver.cs
index 3c722ef..20d4ff7 100644
--- a/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/ReduceReceiver.cs
+++ b/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/ReduceReceiver.cs
@@ -17,13 +17,12 @@
  * under the License.
  */
 
+using System.Reactive;
 using Org.Apache.REEF.Network.Group.Config;
-using Org.Apache.REEF.Network.Group.Driver;
 using Org.Apache.REEF.Network.Group.Driver.Impl;
 using Org.Apache.REEF.Network.Group.Task;
 using Org.Apache.REEF.Network.Group.Task.Impl;
 using Org.Apache.REEF.Tang.Annotations;
-using System.Reactive;
 
 namespace Org.Apache.REEF.Network.Group.Operators.Impl
 {
@@ -35,8 +34,8 @@ namespace Org.Apache.REEF.Network.Group.Operators.Impl
     {
         private const int DefaultVersion = 1;
 
-        private ICommunicationGroupNetworkObserver _networkHandler;
-        private OperatorTopology<T> _topology;
+        private readonly ICommunicationGroupNetworkObserver _networkHandler;
+        private readonly OperatorTopology<T> _topology;
 
         /// <summary>
         /// Creates a new ReduceReceiver.

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/ReduceSender.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/ReduceSender.cs b/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/ReduceSender.cs
index ffc5165..1c27759 100644
--- a/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/ReduceSender.cs
+++ b/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/ReduceSender.cs
@@ -17,14 +17,13 @@
  * under the License.
  */
 
+using System;
+using System.Reactive;
 using Org.Apache.REEF.Network.Group.Config;
-using Org.Apache.REEF.Network.Group.Driver;
 using Org.Apache.REEF.Network.Group.Driver.Impl;
 using Org.Apache.REEF.Network.Group.Task;
 using Org.Apache.REEF.Network.Group.Task.Impl;
 using Org.Apache.REEF.Tang.Annotations;
-using System;
-using System.Reactive;
 
 namespace Org.Apache.REEF.Network.Group.Operators.Impl
 {
@@ -36,8 +35,8 @@ namespace Org.Apache.REEF.Network.Group.Operators.Impl
     {
         private const int DefaultVersion = 1;
 
-        private ICommunicationGroupNetworkObserver _networkHandler;
-        private OperatorTopology<T> _topology;
+        private readonly ICommunicationGroupNetworkObserver _networkHandler;
+        private readonly OperatorTopology<T> _topology;
 
         /// <summary>
         /// Creates a new ReduceSender.

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/ScatterOperatorSpec.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/ScatterOperatorSpec.cs b/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/ScatterOperatorSpec.cs
index 8219eb6..57cd3a9 100644
--- a/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/ScatterOperatorSpec.cs
+++ b/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/ScatterOperatorSpec.cs
@@ -17,11 +17,6 @@
  * under the License.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Org.Apache.REEF.Wake.Remote;
 
 namespace Org.Apache.REEF.Network.Group.Operators.Impl