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:23 UTC

[3/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.Tang.Tests/Injection/TestListInjection.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestListInjection.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestListInjection.cs
index aa37c72..bbf92b6 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestListInjection.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestListInjection.cs
@@ -19,12 +19,12 @@
 
 using System;
 using System.Collections.Generic;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Org.Apache.REEF.Tang.Annotations;
+using Org.Apache.REEF.Tang.Implementations.Tang;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Types;
 using Org.Apache.REEF.Tang.Util;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Org.Apache.REEF.Tang.Implementations.Tang;
 
 namespace Org.Apache.REEF.Tang.Tests.Injection
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestMissingParameters.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestMissingParameters.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestMissingParameters.cs
index 9c88639..a00d994 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestMissingParameters.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestMissingParameters.cs
@@ -17,14 +17,12 @@
  * under the License.
  */
 
-using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Tang.Exceptions;
-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 Microsoft.VisualStudio.TestTools.UnitTesting;
-using Org.Apache.REEF.Tang.Implementations.Tang;
 
 namespace Org.Apache.REEF.Tang.Tests.Injection
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestMissingParamtersInNested.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestMissingParamtersInNested.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestMissingParamtersInNested.cs
index 414552a..93b105a 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestMissingParamtersInNested.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestMissingParamtersInNested.cs
@@ -17,14 +17,12 @@
  * under the License.
  */
 
-using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Tang.Exceptions;
-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 Microsoft.VisualStudio.TestTools.UnitTesting;
-using Org.Apache.REEF.Tang.Implementations.Tang;
 
 namespace Org.Apache.REEF.Tang.Tests.Injection
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestMultipleConstructors.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestMultipleConstructors.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestMultipleConstructors.cs
index e0c5fd6..4b32d0a 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestMultipleConstructors.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestMultipleConstructors.cs
@@ -18,13 +18,12 @@
  */
 
 using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Tang.Exceptions;
-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 Microsoft.VisualStudio.TestTools.UnitTesting;
-using Org.Apache.REEF.Tang.Implementations.Tang;
 
 namespace Org.Apache.REEF.Tang.Tests.Injection
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestNamedParameter.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestNamedParameter.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestNamedParameter.cs
index e4dcd50..49214b8 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestNamedParameter.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestNamedParameter.cs
@@ -17,13 +17,11 @@
  * under the License.
  */
 
-using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Org.Apache.REEF.Tang.Annotations;
-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 Microsoft.VisualStudio.TestTools.UnitTesting;
-using Org.Apache.REEF.Tang.Implementations.Tang;
 
 namespace Org.Apache.REEF.Tang.Tests.Injection
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestSetInjection.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestSetInjection.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestSetInjection.cs
index 2170638..a360a13 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestSetInjection.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestSetInjection.cs
@@ -19,13 +19,12 @@
 
 using System;
 using System.Collections.Generic;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Org.Apache.REEF.Tang.Annotations;
 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 Microsoft.VisualStudio.TestTools.UnitTesting;
-using Org.Apache.REEF.Tang.Implementations.Tang;
 
 namespace Org.Apache.REEF.Tang.Tests.Injection
 {
@@ -328,7 +327,7 @@ namespace Org.Apache.REEF.Tang.Tests.Injection
 
         public class Integer : INumber
         {
-            private int val;
+            private readonly int val;
           
             public Integer(int v)
             {
@@ -377,7 +376,7 @@ namespace Org.Apache.REEF.Tang.Tests.Injection
 
         public class Float : INumber
         {
-            private float val;
+            private readonly float val;
 
             [Inject]
             public Float(float v)
@@ -428,7 +427,7 @@ namespace Org.Apache.REEF.Tang.Tests.Injection
         
         public class Integer1 : INumber
         {
-            private int val;
+            private readonly int val;
 
             [Inject]
             public Integer1([Parameter(typeof(NamedInt))] int v)
@@ -483,7 +482,7 @@ namespace Org.Apache.REEF.Tang.Tests.Injection
 
         public class Integer2 : INumber
         {
-            private int val;
+            private readonly int val;
 
             [Inject]
             public Integer2()
@@ -533,7 +532,7 @@ namespace Org.Apache.REEF.Tang.Tests.Injection
 
         public class Integer3 : INumber
         {
-            private int val;
+            private readonly int val;
 
             [Inject]
             public Integer3([Parameter(typeof(NamedInt))] int v)
@@ -588,7 +587,7 @@ namespace Org.Apache.REEF.Tang.Tests.Injection
 
         public class Float1 : INumber
         {
-            private float val;
+            private readonly float val;
 
             [Inject]
             public Float1([Parameter(typeof(NamedFloat))] float v)

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj b/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj
index a3dcf2f..83a0592 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj
@@ -39,19 +39,11 @@ under the License.
       <HintPath>$(PackagesDir)\Microsoft.Hadoop.Avro.$(AvroVersion)\lib\net40\Microsoft.Hadoop.Avro.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>$(PackagesDir)\Newtonsoft.Json.$(NewtonsoftJsonVersion)\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="protobuf-net">
       <HintPath>$(PackagesDir)\protobuf-net.$(ProtobufVersion)\lib\net40\protobuf-net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <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="ClassHierarchy\TestAnonymousType.cs" />
@@ -145,10 +137,6 @@ under the License.
       <Project>{97dbb573-3994-417a-9f69-ffa25f00d2a6}</Project>
       <Name>Org.Apache.REEF.Tang</Name>
     </ProjectReference>
-    <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.csproj">
-      <Project>{79e7f89a-1dfb-45e1-8d43-d71a954aeb98}</Project>
-      <Name>Org.Apache.REEF.Utilities</Name>
-    </ProjectReference>
     <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.csproj">
       <Project>{cdfb3464-4041-42b1-9271-83af24cd5008}</Project>
       <Name>Org.Apache.REEF.Wake</Name>
@@ -166,4 +154,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.Tang.Tests/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Properties/AssemblyInfo.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/Properties/AssemblyInfo.cs
index 58c9f71..c2f8f54 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/Properties/AssemblyInfo.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/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.Tang.Tests/ScenarioTest/HttpServer.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/HttpServer.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/HttpServer.cs
index 06a5ed9..0942330 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/HttpServer.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/HttpServer.cs
@@ -23,7 +23,7 @@ namespace Org.Apache.REEF.Tang.Tests.ScenarioTest
 {
     public class HttpServer
     {
-        private Server _server;
+        private readonly Server _server;
 
         [Inject]
         public HttpServer(JettyHandler jettyHandler)

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/TestDefaultConstructor.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/TestDefaultConstructor.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/TestDefaultConstructor.cs
index e8afdfb..1f042b0 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/TestDefaultConstructor.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/TestDefaultConstructor.cs
@@ -17,9 +17,8 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Tang.Annotations;
-using Org.Apache.REEF.Tang.Implementations;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Tang.Implementations.Tang;
 
 namespace Org.Apache.REEF.Tang.Tests.ScenarioTest

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/TestHttpService.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/TestHttpService.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/TestHttpService.cs
index e7baeb1..98388b3 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/TestHttpService.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/TestHttpService.cs
@@ -18,13 +18,12 @@
  */
 
 using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Org.Apache.REEF.Tang.Annotations;
 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 Microsoft.VisualStudio.TestTools.UnitTesting;
-using Org.Apache.REEF.Tang.Implementations.Tang;
 
 namespace Org.Apache.REEF.Tang.Tests.ScenarioTest
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/TestRuntimeClock.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/TestRuntimeClock.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/TestRuntimeClock.cs
index 6000a5a..6191b22 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/TestRuntimeClock.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/TestRuntimeClock.cs
@@ -19,14 +19,13 @@
 
 using System;
 using System.Collections.Generic;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Tang.Formats;
-using Org.Apache.REEF.Tang.Implementations;
-using Org.Apache.REEF.Tang.Interface;
-using Org.Apache.REEF.Tang.Util;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Org.Apache.REEF.Tang.Implementations.InjectionPlan;
 using Org.Apache.REEF.Tang.Implementations.Tang;
+using Org.Apache.REEF.Tang.Interface;
+using Org.Apache.REEF.Tang.Util;
 
 namespace Org.Apache.REEF.Tang.Tests.ScenarioTest
 {
@@ -200,7 +199,7 @@ namespace Org.Apache.REEF.Tang.Tests.ScenarioTest
 
     public abstract class Time : IComparable<Time>
     {
-        private long timestamp;
+        private readonly long timestamp;
 
         public Time(long timestamp)
         {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/TestTrackingURIProvider.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/TestTrackingURIProvider.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/TestTrackingURIProvider.cs
index 3c110dd..b7cd55a 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/TestTrackingURIProvider.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/TestTrackingURIProvider.cs
@@ -17,12 +17,10 @@
  * under the License.
  */
 
-using System;
-using Org.Apache.REEF.Tang.Implementations;
-using Org.Apache.REEF.Tang.Interface;
-using Org.Apache.REEF.Tang.Util;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Org.Apache.REEF.Tang.Implementations.Tang;
+using Org.Apache.REEF.Tang.Interface;
+using Org.Apache.REEF.Tang.Util;
 
 namespace Org.Apache.REEF.Tang.Tests.ScenarioTest
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/TrackingURIProvider.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/TrackingURIProvider.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/TrackingURIProvider.cs
index 0c0d0f6..fd864bd 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/TrackingURIProvider.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/TrackingURIProvider.cs
@@ -40,7 +40,7 @@ namespace Org.Apache.REEF.Tang.Tests.ScenarioTest
 
     public class DefaultTrackingURIProvider : ITrackingURIProvider
     {
-        private string port;
+        private readonly string port;
 
         [Inject]
         public DefaultTrackingURIProvider([Parameter(typeof(PortNumber))] string port)

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/CyclicDependencyClassTwo.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/CyclicDependencyClassTwo.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/CyclicDependencyClassTwo.cs
index 4019d2a..c483435 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/CyclicDependencyClassTwo.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/CyclicDependencyClassTwo.cs
@@ -18,7 +18,6 @@
  */
 
 using Org.Apache.REEF.Tang.Annotations;
-using Org.Apache.REEF.Tang.Implementations;
 using Org.Apache.REEF.Tang.Implementations.InjectionPlan;
 
 namespace Org.Apache.REEF.Tang.Tests.SmokeTest

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/ListOfBaseTypes.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/ListOfBaseTypes.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/ListOfBaseTypes.cs
index ad64431..f843356 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/ListOfBaseTypes.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/ListOfBaseTypes.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.Tang.Tests.SmokeTest

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/ObjectTreeTest.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/ObjectTreeTest.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/ObjectTreeTest.cs
index ec3b7d2..2852b08 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/ObjectTreeTest.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/ObjectTreeTest.cs
@@ -17,10 +17,9 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Tang.Implementations;
-using Org.Apache.REEF.Tang.Interface;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Org.Apache.REEF.Tang.Implementations.Tang;
+using Org.Apache.REEF.Tang.Interface;
 
 namespace Org.Apache.REEF.Tang.Tests.SmokeTest
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/RoundTripTest.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/RoundTripTest.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/RoundTripTest.cs
index d103158..a92aa64 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/RoundTripTest.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/RoundTripTest.cs
@@ -17,10 +17,9 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Tang.Implementations;
-using Org.Apache.REEF.Tang.Interface;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Org.Apache.REEF.Tang.Implementations.Tang;
+using Org.Apache.REEF.Tang.Interface;
 
 namespace Org.Apache.REEF.Tang.Tests.SmokeTest
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/SetOfBaseTypes.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/SetOfBaseTypes.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/SetOfBaseTypes.cs
index fedbbd8..7809eab 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/SetOfBaseTypes.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/SetOfBaseTypes.cs
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-using System;
 using System.Collections.Generic;
 using Org.Apache.REEF.Tang.Annotations;
 

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/TestConfigurationModuleBuilder.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/TestConfigurationModuleBuilder.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/TestConfigurationModuleBuilder.cs
index e08ef78..b8164b8 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/TestConfigurationModuleBuilder.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/TestConfigurationModuleBuilder.cs
@@ -17,13 +17,11 @@
  * under the License.
  */
 
-using System;
 using System.Collections.Generic;
 using System.Globalization;
 using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Tang.Formats;
 using Org.Apache.REEF.Tang.Util;
-using Org.Apache.REEF.Tang.Tests.Format;
 
 namespace Org.Apache.REEF.Tang.Tests.SmokeTest
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/Tang/TestDefaultImpementaion.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Tang/TestDefaultImpementaion.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/Tang/TestDefaultImpementaion.cs
index 848c99e..e34230b 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/Tang/TestDefaultImpementaion.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Tang/TestDefaultImpementaion.cs
@@ -17,13 +17,12 @@
  * under the License.
  */
 
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Tang.Exceptions;
-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 Microsoft.VisualStudio.TestTools.UnitTesting;
-using Org.Apache.REEF.Tang.Implementations.Tang;
 
 namespace Org.Apache.REEF.Tang.Tests.Tang
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/Tang/TestExternalConstructors.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Tang/TestExternalConstructors.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/Tang/TestExternalConstructors.cs
index 99377a2..d1abe31 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/Tang/TestExternalConstructors.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Tang/TestExternalConstructors.cs
@@ -17,12 +17,11 @@
  * under the License.
  */
 
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Org.Apache.REEF.Tang.Annotations;
-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 Microsoft.VisualStudio.TestTools.UnitTesting;
-using Org.Apache.REEF.Tang.Implementations.Tang;
 
 namespace Org.Apache.REEF.Tang.Tests.Tang
 {
@@ -98,7 +97,7 @@ namespace Org.Apache.REEF.Tang.Tests.Tang
 
         public class BCons : IExternalConstructor<B>
         {
-            private A a;
+            private readonly A a;
             [Inject]
             BCons(A a)
             {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/Tang/TestLegacyConstructors.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Tang/TestLegacyConstructors.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/Tang/TestLegacyConstructors.cs
index 9bc860e..e7ddcd7 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/Tang/TestLegacyConstructors.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Tang/TestLegacyConstructors.cs
@@ -17,12 +17,11 @@
  * under the License.
  */
 
-using System;
 using System.Collections.Generic;
-using Org.Apache.REEF.Tang.Interface;
-using Org.Apache.REEF.Tang.Util;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Org.Apache.REEF.Tang.Implementations.Tang;
+using Org.Apache.REEF.Tang.Interface;
+using Org.Apache.REEF.Tang.Util;
 
 namespace Org.Apache.REEF.Tang.Tests.Tang
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/Tang/TestTang.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Tang/TestTang.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/Tang/TestTang.cs
index df18b7a..0bc521a 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/Tang/TestTang.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Tang/TestTang.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,18 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 using System.Reflection;
-using Org.Apache.REEF.Tang.Annotations;
-using Org.Apache.REEF.Tang.Exceptions;
-using Org.Apache.REEF.Tang.Implementations;
-using Org.Apache.REEF.Tang.Interface;
-using Org.Apache.REEF.Tang.Types;
-using Org.Apache.REEF.Tang.Util;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Tang.Examples;
-using Org.Apache.REEF.Tang.Implementations.Tang;
+using Org.Apache.REEF.Tang.Exceptions;
 using Org.Apache.REEF.Tang.Implementations.InjectionPlan;
+using Org.Apache.REEF.Tang.Implementations.Tang;
+using Org.Apache.REEF.Tang.Interface;
+using Org.Apache.REEF.Tang.Types;
+using Org.Apache.REEF.Tang.Util;
 
 namespace Org.Apache.REEF.Tang.Tests.Tang
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/Utilities/TestUtilities.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Utilities/TestUtilities.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/Utilities/TestUtilities.cs
index 2b274a7..c284c38 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/Utilities/TestUtilities.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Utilities/TestUtilities.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,14 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 using System.Collections.Generic;
 using System.Reflection;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Org.Apache.REEF.Tang.Examples;
 using Org.Apache.REEF.Tang.Formats;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Util;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Org.Apache.REEF.Tang.Examples;
 
 namespace Org.Apache.REEF.Tang.Tests.Utilities
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tools/ClassHierarchyBuilder.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tools/ClassHierarchyBuilder.cs b/lang/cs/Org.Apache.REEF.Tang.Tools/ClassHierarchyBuilder.cs
index c340b1f..03b3bd7 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tools/ClassHierarchyBuilder.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tools/ClassHierarchyBuilder.cs
@@ -17,10 +17,6 @@
  * under the License.
  */
 
-using Org.Apache.REEF.Tang.Implementations;
-using Org.Apache.REEF.Tang.Interface;
-using Org.Apache.REEF.Tang.Protobuf;
-using Org.Apache.REEF.Tang.Types;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -30,6 +26,9 @@ using Org.Apache.REEF.Examples.Tasks.HelloTask;
 using Org.Apache.REEF.Examples.Tasks.ShellTask;
 using Org.Apache.REEF.Examples.Tasks.StreamingTasks;
 using Org.Apache.REEF.Tang.Implementations.Tang;
+using Org.Apache.REEF.Tang.Interface;
+using Org.Apache.REEF.Tang.Protobuf;
+using Org.Apache.REEF.Tang.Types;
 
 namespace Org.Apache.REEF.Tang.Tools
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tools/Org.Apache.REEF.Tang.Tools.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tools/Org.Apache.REEF.Tang.Tools.csproj b/lang/cs/Org.Apache.REEF.Tang.Tools/Org.Apache.REEF.Tang.Tools.csproj
index 7af9225..d8b2b32 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tools/Org.Apache.REEF.Tang.Tools.csproj
+++ b/lang/cs/Org.Apache.REEF.Tang.Tools/Org.Apache.REEF.Tang.Tools.csproj
@@ -37,11 +37,6 @@ under the License.
   <ItemGroup>
     <Reference Include="System" />
     <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="ClassHierarchyBuilder.cs" />
@@ -52,26 +47,14 @@ under the License.
       <Project>{97dbb573-3994-417a-9f69-ffa25f00d2a6}</Project>
       <Name>Org.Apache.REEF.Tang</Name>
     </ProjectReference>
-    <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.csproj">
-      <Project>{79e7f89a-1dfb-45e1-8d43-d71a954aeb98}</Project>
-      <Name>Org.Apache.REEF.Utilities</Name>
-    </ProjectReference>
     <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Common\Org.Apache.REEF.Common.csproj">
       <Project>{545a0582-4105-44ce-b99c-b1379514a630}</Project>
       <Name>Org.Apache.REEF.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Driver\Org.Apache.REEF.Driver.csproj">
-      <Project>{a6baa2a7-f52f-4329-884e-1bcf711d6805}</Project>
-      <Name>Org.Apache.REEF.Driver</Name>
-    </ProjectReference>
     <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Examples\Org.Apache.REEF.Examples.csproj">
       <Project>{75503f90-7b82-4762-9997-94b5c68f15db}</Project>
       <Name>Org.Apache.REEF.Examples</Name>
     </ProjectReference>
-    <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.csproj">
-      <Project>{cdfb3464-4041-42b1-9271-83af24cd5008}</Project>
-      <Name>Org.Apache.REEF.Wake</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -81,4 +64,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.Tang.Tools/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tools/Properties/AssemblyInfo.cs b/lang/cs/Org.Apache.REEF.Tang.Tools/Properties/AssemblyInfo.cs
index a2db1ec..609fc96 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tools/Properties/AssemblyInfo.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tools/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.Tang/Annotations/DefaultImplementation.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Annotations/DefaultImplementation.cs b/lang/cs/Org.Apache.REEF.Tang/Annotations/DefaultImplementation.cs
index cce2914..44b23f0 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Annotations/DefaultImplementation.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Annotations/DefaultImplementation.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,11 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+
+using System;
 
 namespace Org.Apache.REEF.Tang.Annotations
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Annotations/NamedParameter.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Annotations/NamedParameter.cs b/lang/cs/Org.Apache.REEF.Tang/Annotations/NamedParameter.cs
index 902f1fb..0d3170c 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Annotations/NamedParameter.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Annotations/NamedParameter.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 
 namespace Org.Apache.REEF.Tang.Annotations
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Annotations/Parameter.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Annotations/Parameter.cs b/lang/cs/Org.Apache.REEF.Tang/Annotations/Parameter.cs
index 1e4a7c1..862eac6 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Annotations/Parameter.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Annotations/Parameter.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
+
 namespace Org.Apache.REEF.Tang.Annotations
 {
     /// <summary>

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Annotations/Unit.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Annotations/Unit.cs b/lang/cs/Org.Apache.REEF.Tang/Annotations/Unit.cs
index cfaac0d..f8cd7a4 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Annotations/Unit.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Annotations/Unit.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
+
 namespace Org.Apache.REEF.Tang.Annotations
 {
     /// <summary>

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Exceptions/BindException.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Exceptions/BindException.cs b/lang/cs/Org.Apache.REEF.Tang/Exceptions/BindException.cs
index 032eda0..22ee144 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Exceptions/BindException.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Exceptions/BindException.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 
 namespace Org.Apache.REEF.Tang.Exceptions
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Exceptions/ClassHierarchyException.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Exceptions/ClassHierarchyException.cs b/lang/cs/Org.Apache.REEF.Tang/Exceptions/ClassHierarchyException.cs
index 60697c2..496aea6 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Exceptions/ClassHierarchyException.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Exceptions/ClassHierarchyException.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 
 namespace Org.Apache.REEF.Tang.Exceptions
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Exceptions/IllegalStateException.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Exceptions/IllegalStateException.cs b/lang/cs/Org.Apache.REEF.Tang/Exceptions/IllegalStateException.cs
index f62e207..1757b04 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Exceptions/IllegalStateException.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Exceptions/IllegalStateException.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 
 namespace Org.Apache.REEF.Tang.Exceptions
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Exceptions/InjectionException.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Exceptions/InjectionException.cs b/lang/cs/Org.Apache.REEF.Tang/Exceptions/InjectionException.cs
index 9b72c59..a5f31f6 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Exceptions/InjectionException.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Exceptions/InjectionException.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 
 namespace Org.Apache.REEF.Tang.Exceptions
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Exceptions/NameResolutionException.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Exceptions/NameResolutionException.cs b/lang/cs/Org.Apache.REEF.Tang/Exceptions/NameResolutionException.cs
index af80096..e023f68 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Exceptions/NameResolutionException.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Exceptions/NameResolutionException.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 
 namespace Org.Apache.REEF.Tang.Exceptions
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Exceptions/ParseException.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Exceptions/ParseException.cs b/lang/cs/Org.Apache.REEF.Tang/Exceptions/ParseException.cs
index 26d03a4..45a4ae1 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Exceptions/ParseException.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Exceptions/ParseException.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 
 namespace Org.Apache.REEF.Tang.Exceptions
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Formats/AvroConfigurationSerializer.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Formats/AvroConfigurationSerializer.cs b/lang/cs/Org.Apache.REEF.Tang/Formats/AvroConfigurationSerializer.cs
index cbb8a29..64331fc 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Formats/AvroConfigurationSerializer.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Formats/AvroConfigurationSerializer.cs
@@ -26,16 +26,15 @@ using System.Runtime.Serialization;
 using System.Text;
 using Microsoft.Hadoop.Avro;
 using Microsoft.Hadoop.Avro.Container;
-using Org.Apache.REEF.Utilities.Logging;
+using Newtonsoft.Json;
 using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Tang.Exceptions;
-using Org.Apache.REEF.Tang.Implementations;
-using Org.Apache.REEF.Tang.Interface;
-using Org.Apache.REEF.Tang.Types;
-using Newtonsoft.Json;
 using Org.Apache.REEF.Tang.Formats.AvroConfigurationDataContract;
 using Org.Apache.REEF.Tang.Implementations.Configuration;
 using Org.Apache.REEF.Tang.Implementations.Tang;
+using Org.Apache.REEF.Tang.Interface;
+using Org.Apache.REEF.Tang.Types;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Tang.Formats
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationFile.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationFile.cs b/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationFile.cs
index 4042d8b..8266417 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationFile.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationFile.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,20 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
-using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Tang.Exceptions;
-using Org.Apache.REEF.Tang.Implementations;
-using Org.Apache.REEF.Tang.Interface;
-using Org.Apache.REEF.Tang.Types;
-using Org.Apache.REEF.Tang.Util;
+using Org.Apache.REEF.Tang.Exceptions;
 using Org.Apache.REEF.Tang.Implementations.Configuration;
 using Org.Apache.REEF.Tang.Implementations.Tang;
+using Org.Apache.REEF.Tang.Interface;
+using Org.Apache.REEF.Tang.Types;
+using Org.Apache.REEF.Tang.Util;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Tang.Formats
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationModule.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationModule.cs b/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationModule.cs
index cb95dd1..5fda89d 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationModule.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationModule.cs
@@ -19,14 +19,11 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using Org.Apache.REEF.Utilities.Logging;
 using Org.Apache.REEF.Tang.Exceptions;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Util;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Tang.Formats
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationModuleBuilder.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationModuleBuilder.cs b/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationModuleBuilder.cs
index 546f042..03571ea 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationModuleBuilder.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationModuleBuilder.cs
@@ -21,13 +21,12 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Text;
-using Org.Apache.REEF.Utilities.Logging;
 using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Tang.Exceptions;
-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 Org.Apache.REEF.Tang.Implementations.Tang;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Tang.Formats
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Formats/IConfigurationSerializer.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Formats/IConfigurationSerializer.cs b/lang/cs/Org.Apache.REEF.Tang/Formats/IConfigurationSerializer.cs
index 9b272a5..efc7c53 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Formats/IConfigurationSerializer.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Formats/IConfigurationSerializer.cs
@@ -18,7 +18,6 @@
  */
 
 using Org.Apache.REEF.Tang.Annotations;
-using Org.Apache.REEF.Tang.Formats;
 using Org.Apache.REEF.Tang.Interface;
 
 namespace Org.Apache.REEF.Tang.Formats

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Formats/IImpl.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Formats/IImpl.cs b/lang/cs/Org.Apache.REEF.Tang/Formats/IImpl.cs
index 586acda..cb03b93 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Formats/IImpl.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Formats/IImpl.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.Tang.Formats
 {
     public interface IImpl<T>

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Formats/IParam.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Formats/IParam.cs b/lang/cs/Org.Apache.REEF.Tang/Formats/IParam.cs
index 408a6e6..8e7dd24 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Formats/IParam.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Formats/IParam.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.Tang.Formats
 {
     public interface IParam<T>

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Formats/OptionalImpl.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Formats/OptionalImpl.cs b/lang/cs/Org.Apache.REEF.Tang/Formats/OptionalImpl.cs
index 961d64f..036cc78 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Formats/OptionalImpl.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Formats/OptionalImpl.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.Tang.Formats
 {
     public sealed class OptionalImpl<T> : IImpl<T> 

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Formats/OptionalParameter.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Formats/OptionalParameter.cs b/lang/cs/Org.Apache.REEF.Tang/Formats/OptionalParameter.cs
index 3fe0e58..a940da3 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Formats/OptionalParameter.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Formats/OptionalParameter.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.Tang.Formats
 {
     public sealed class OptionalParameter<T> : IParam<T> 

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Formats/Provides.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Formats/Provides.cs b/lang/cs/Org.Apache.REEF.Tang/Formats/Provides.cs
index edc897e..d316a1d 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Formats/Provides.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Formats/Provides.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.Tang.Formats
 {
     public sealed class Provides<T> 

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Formats/RequiredImpl.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Formats/RequiredImpl.cs b/lang/cs/Org.Apache.REEF.Tang/Formats/RequiredImpl.cs
index 1ffe312..c914844 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Formats/RequiredImpl.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Formats/RequiredImpl.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.Tang.Formats
 {
     public sealed class RequiredImpl<T> : IImpl<T> 

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Formats/RequiredParameter.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Formats/RequiredParameter.cs b/lang/cs/Org.Apache.REEF.Tang/Formats/RequiredParameter.cs
index fdb1c48..62a6a2b 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Formats/RequiredParameter.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Formats/RequiredParameter.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.Tang.Formats
 {
     public sealed class RequiredParameter<T> : IParam<T> 

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AbstractNode.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AbstractNode.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AbstractNode.cs
index 626a4a0..5eedaea 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AbstractNode.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AbstractNode.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,9 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 using System.Collections.Generic;
-using Org.Apache.REEF.Tang.Types;
+using Org.Apache.REEF.Tang.Types;
 using Org.Apache.REEF.Tang.Util;
 
 namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
@@ -28,14 +29,14 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
         /// It is from Type.FullName. This name is used as Name in a Node. 
         /// It is not unique for a generic type with different type of arguments.
         /// It is used for toString or debug info as AssemblyQualifiedName is really long
-        private String name;
+        private readonly String name;
 
         /// It is from Type.AssemblyQualifiedName. THis name is used as full name in a Node
         /// It is unique for a generic type with different type of arguments.
-        private String fullName; //it comes from 
+        private readonly String fullName; //it comes from 
 
         //parent node in the class hierarchy
-        private INode parent; 
+        private readonly INode parent; 
         
         //children in the class hierarchy
         protected IDictionary<String, INode> children = new MonotonicTreeMap<string, INode>();

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ClassHierarchyImpl.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ClassHierarchyImpl.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ClassHierarchyImpl.cs
index 1f2fe82..6820317 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ClassHierarchyImpl.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ClassHierarchyImpl.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,27 +16,28 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text;
-using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Tang.Annotations;
+using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Tang.Exceptions;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Types;
 using Org.Apache.REEF.Tang.Util;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
 {
     public class ClassHierarchyImpl : ICsClassHierarchy
     {
         private static readonly Logger LOGGER = Logger.GetLogger(typeof (ClassHierarchyImpl));
-        private INode rootNode;
-        private MonotonicTreeMap<String, INamedParameterNode> shortNames = new MonotonicTreeMap<String, INamedParameterNode>();
-        private IList<string> assemblies;
-        private AssemblyLoader loader = null;
+        private readonly INode rootNode;
+        private readonly MonotonicTreeMap<String, INamedParameterNode> shortNames = new MonotonicTreeMap<String, INamedParameterNode>();
+        private readonly IList<string> assemblies;
+        private readonly AssemblyLoader loader = null;
 
         public ParameterParser Parameterparser = new ParameterParser();
 

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ClassNodeImpl.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ClassNodeImpl.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ClassNodeImpl.cs
index 5d529b2..759ecc4 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ClassNodeImpl.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ClassNodeImpl.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
-using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Tang.Exceptions;
+using Org.Apache.REEF.Tang.Exceptions;
 using Org.Apache.REEF.Tang.Types;
 using Org.Apache.REEF.Tang.Util;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ConstructorArgImpl.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ConstructorArgImpl.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ConstructorArgImpl.cs
index f1083f6..a8a41b5 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ConstructorArgImpl.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ConstructorArgImpl.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 using Org.Apache.REEF.Tang.Types;
 
 namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ConstructorDefImpl.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ConstructorDefImpl.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ConstructorDefImpl.cs
index 624189d..8d8c77a 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ConstructorDefImpl.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ConstructorDefImpl.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,13 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Tang.Exceptions;
+using Org.Apache.REEF.Tang.Exceptions;
 using Org.Apache.REEF.Tang.Types;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/NamedParameterNodeImpl.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/NamedParameterNodeImpl.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/NamedParameterNodeImpl.cs
index fcfff7f..d2a52ec 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/NamedParameterNodeImpl.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/NamedParameterNodeImpl.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 using Org.Apache.REEF.Tang.Types;
 
 namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/NodeFactory.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/NodeFactory.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/NodeFactory.cs
index 2f73509..012eed9 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/NodeFactory.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/NodeFactory.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,16 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 using System.Collections.Generic;
 using System.Reflection;
-using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Tang.Annotations;
-using Org.Apache.REEF.Tang.Types;
-using Org.Apache.REEF.Tang.Util;
+using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Tang.Exceptions;
-using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Implementations.InjectionPlan;
+using Org.Apache.REEF.Tang.Interface;
+using Org.Apache.REEF.Tang.Types;
+using Org.Apache.REEF.Tang.Util;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/PackageNodeImpl.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/PackageNodeImpl.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/PackageNodeImpl.cs
index 4ff51f2..a5e68d4 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/PackageNodeImpl.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/PackageNodeImpl.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 using Org.Apache.REEF.Tang.Types;
 
 namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ParameterParser.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ParameterParser.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ParameterParser.cs
index 2396e4a..5d6569f 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ParameterParser.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ParameterParser.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,13 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 using System.Collections.Generic;
 using System.Reflection;
-using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Tang.Exceptions;
+using Org.Apache.REEF.Tang.Exceptions;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Util;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
 {
@@ -30,7 +31,7 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
     {
         private static readonly Logger LOGGER = Logger.GetLogger(typeof(ParameterParser));
 
-        MonotonicTreeMap<String, ConstructorInfo> parsers = new MonotonicTreeMap<String, ConstructorInfo>();
+        readonly MonotonicTreeMap<String, ConstructorInfo> parsers = new MonotonicTreeMap<String, ConstructorInfo>();
 
         //ec: ACons, tc: A
         public void AddParser(Type ec)

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Implementations/Configuration/ConfigurationBuilderImpl.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/Configuration/ConfigurationBuilderImpl.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/Configuration/ConfigurationBuilderImpl.cs
index 4098195..da55253 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/Configuration/ConfigurationBuilderImpl.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/Configuration/ConfigurationBuilderImpl.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,19 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
+using System.Globalization;
 using System.Text;
-using System.Threading.Tasks;
-using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Tang.Exceptions;
+using Org.Apache.REEF.Tang.Exceptions;
+using Org.Apache.REEF.Tang.Implementations.ClassHierarchy;
+using Org.Apache.REEF.Tang.Implementations.Tang;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Types;
 using Org.Apache.REEF.Tang.Util;
-using Org.Apache.REEF.Tang.Implementations.ClassHierarchy;
-using Org.Apache.REEF.Tang.Implementations.Tang;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Tang.Implementations.Configuration
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Implementations/Configuration/ConfigurationImpl.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/Configuration/ConfigurationImpl.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/Configuration/ConfigurationImpl.cs
index 024ab87..2fbc37e 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/Configuration/ConfigurationImpl.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/Configuration/ConfigurationImpl.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 using System.Collections.Generic;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Types;

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Implementations/Configuration/CsConfigurationBuilderImpl.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/Configuration/CsConfigurationBuilderImpl.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/Configuration/CsConfigurationBuilderImpl.cs
index db9b042..2c48d93 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/Configuration/CsConfigurationBuilderImpl.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/Configuration/CsConfigurationBuilderImpl.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Tang.Annotations;
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Tang.Exceptions;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Types;
 using Org.Apache.REEF.Tang.Util;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Tang.Implementations.Configuration
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Implementations/Configuration/CsConfigurationImpl.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/Configuration/CsConfigurationImpl.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/Configuration/CsConfigurationImpl.cs
index c72206a..347cb85 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/Configuration/CsConfigurationImpl.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/Configuration/CsConfigurationImpl.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,12 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Org.Apache.REEF.Tang.Interface;
 
 namespace Org.Apache.REEF.Tang.Implementations.Configuration
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/Constructor.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/Constructor.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/Constructor.cs
index fbce0d0..9e8c71b 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/Constructor.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/Constructor.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
-using System.Collections;
+
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
-using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Tang.Types;
+using Org.Apache.REEF.Tang.Types;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Tang.Implementations.InjectionPlan
 {
@@ -32,11 +32,11 @@ namespace Org.Apache.REEF.Tang.Implementations.InjectionPlan
     {
         private static readonly Logger LOGGER = Logger.GetLogger(typeof(Constructor));
 
-        IConstructorDef constructor;  //which constructor to use
-        InjectionPlan[] args; //constructor arguments in which we already got injectionPlan for each (nested cases)
-        int numAlternatives;
-        bool isAmbiguous;
-        bool isInjectable;
+        readonly IConstructorDef constructor;  //which constructor to use
+        readonly InjectionPlan[] args; //constructor arguments in which we already got injectionPlan for each (nested cases)
+        readonly int numAlternatives;
+        readonly bool isAmbiguous;
+        readonly bool isInjectable;
 
         public InjectionPlan[] GetArgs() 
         {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/CsInstance.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/CsInstance.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/CsInstance.cs
index 5db415b..e14aa64 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/CsInstance.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/CsInstance.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,13 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Tang.Types;
+
+using System;
+using Org.Apache.REEF.Tang.Types;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Tang.Implementations.InjectionPlan
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/InjectionFuture.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/InjectionFuture.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/InjectionFuture.cs
index cfe4e40..445225b 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/InjectionFuture.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/InjectionFuture.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,12 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
-using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Tang.Annotations;
-using Org.Apache.REEF.Tang.Exceptions;
+
+using System;
+using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Tang.Interface;
-using Org.Apache.REEF.Tang.Util;
+using Org.Apache.REEF.Tang.Util;
 
 namespace Org.Apache.REEF.Tang.Implementations.InjectionPlan
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/InjectionFuturePlan.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/InjectionFuturePlan.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/InjectionFuturePlan.cs
index 6d27c44..fcd969a 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/InjectionFuturePlan.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/InjectionFuturePlan.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,9 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
-using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Tang.Types;
+
+using System;
+using Org.Apache.REEF.Tang.Types;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Tang.Implementations.InjectionPlan
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/InjectionPlan.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/InjectionPlan.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/InjectionPlan.cs
index 8ed459f..82503e8 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/InjectionPlan.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/InjectionPlan.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,11 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 using System.Collections.Generic;
 using System.Text;
-using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Tang.Types;
+using Org.Apache.REEF.Tang.Types;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Tang.Implementations.InjectionPlan
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/InjectorImpl.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/InjectorImpl.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/InjectorImpl.cs
index 42703e3..bf622df 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/InjectorImpl.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/InjectorImpl.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,20 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
+using System.Globalization;
+using System.Linq;
 using System.Reflection;
 using System.Text;
-using System.Threading.Tasks;
-using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Tang.Annotations;
+using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Tang.Exceptions;
+using Org.Apache.REEF.Tang.Implementations.Configuration;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Types;
 using Org.Apache.REEF.Tang.Util;
-using Org.Apache.REEF.Tang.Implementations.Configuration;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Tang.Implementations.InjectionPlan
 {
@@ -37,9 +37,9 @@ namespace Org.Apache.REEF.Tang.Implementations.InjectionPlan
     {
         private static readonly Logger LOGGER = Logger.GetLogger(typeof(InjectorImpl));
 
-        IDictionary<INamedParameterNode, object> namedParameterInstances = new MonotonicTreeMap<INamedParameterNode, object>();
-        private ICsClassHierarchy classHierarchy;
-        private IConfiguration configuration;
+        readonly IDictionary<INamedParameterNode, object> namedParameterInstances = new MonotonicTreeMap<INamedParameterNode, object>();
+        private readonly ICsClassHierarchy classHierarchy;
+        private readonly IConfiguration configuration;
         readonly IDictionary<IClassNode, Object> instances = new MonotonicTreeMap<IClassNode, Object>();
         private Aspect aspect;
         private readonly ISet<IInjectionFuture<object>> pendingFutures = new HashSet<IInjectionFuture<object>>();

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/SetInjectionPlan.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/SetInjectionPlan.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/SetInjectionPlan.cs
index f761bc3..ffe2b7e 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/SetInjectionPlan.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/SetInjectionPlan.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System.Collections.Generic;
+
+using System.Collections.Generic;
 using System.Text;
 using Org.Apache.REEF.Tang.Types;
 using Org.Apache.REEF.Tang.Util;

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/Subplan.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/Subplan.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/Subplan.cs
index 73420e9..8f6976d 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/Subplan.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/Subplan.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,14 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
-using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Tang.Exceptions;
+using Org.Apache.REEF.Tang.Exceptions;
 using Org.Apache.REEF.Tang.Types;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Tang.Implementations.InjectionPlan
 {
@@ -31,9 +32,9 @@ namespace Org.Apache.REEF.Tang.Implementations.InjectionPlan
     {
         private static readonly Logger LOGGER = Logger.GetLogger(typeof(Subplan));
 
-        InjectionPlan[] alternatives; //all implementatios on the same interface
-        int numAlternatives;
-        int selectedIndex; //the implementation that is bound
+        readonly InjectionPlan[] alternatives; //all implementatios on the same interface
+        readonly int numAlternatives;
+        readonly int selectedIndex; //the implementation that is bound
 
         public Subplan(INode n, int selectedIndex, InjectionPlan[] alternatives)
             : base(n)

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Implementations/Tang/TangFactory.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/Tang/TangFactory.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/Tang/TangFactory.cs
index 0c0b200..10a5a0a 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/Tang/TangFactory.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/Tang/TangFactory.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using Org.Apache.REEF.Tang.Interface;
+
+using Org.Apache.REEF.Tang.Interface;
 
 namespace Org.Apache.REEF.Tang.Implementations.Tang
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Implementations/Tang/TangImpl.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/Tang/TangImpl.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/Tang/TangImpl.cs
index 1707a37..c57db1d 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/Tang/TangImpl.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/Tang/TangImpl.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,16 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
-using System.Collections.Generic;
-using Org.Apache.REEF.Utilities.Logging;
-using Org.Apache.REEF.Tang.Exceptions;
+
+using System;
+using System.Collections.Generic;
+using Org.Apache.REEF.Tang.Exceptions;
 using Org.Apache.REEF.Tang.Formats;
-using Org.Apache.REEF.Tang.Interface;
-using Org.Apache.REEF.Tang.Util;
 using Org.Apache.REEF.Tang.Implementations.ClassHierarchy;
 using Org.Apache.REEF.Tang.Implementations.Configuration;
 using Org.Apache.REEF.Tang.Implementations.InjectionPlan;
+using Org.Apache.REEF.Tang.Interface;
+using Org.Apache.REEF.Tang.Util;
+using Org.Apache.REEF.Utilities.Logging;
 
 namespace Org.Apache.REEF.Tang.Implementations.Tang
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Interface/IAspect.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Interface/IAspect.cs b/lang/cs/Org.Apache.REEF.Tang/Interface/IAspect.cs
index 2552587..7323698 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Interface/IAspect.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Interface/IAspect.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System.Reflection;
-using Org.Apache.REEF.Tang.Implementations;
-using Org.Apache.REEF.Tang.Types;
+
+using System.Reflection;
 using Org.Apache.REEF.Tang.Implementations.InjectionPlan;
+using Org.Apache.REEF.Tang.Types;
 
 namespace Org.Apache.REEF.Tang.Interface
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Interface/IClassHierarchy.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Interface/IClassHierarchy.cs b/lang/cs/Org.Apache.REEF.Tang/Interface/IClassHierarchy.cs
index b8c7cdb..9eca4f1 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Interface/IClassHierarchy.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Interface/IClassHierarchy.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using Org.Apache.REEF.Tang.Types;
+
+using Org.Apache.REEF.Tang.Types;
 
 namespace Org.Apache.REEF.Tang.Interface
 {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang/Interface/IConfiguration.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Interface/IConfiguration.cs b/lang/cs/Org.Apache.REEF.Tang/Interface/IConfiguration.cs
index 315a13a..2544c4d 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Interface/IConfiguration.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Interface/IConfiguration.cs
@@ -1,4 +1,4 @@
-/**
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,11 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-using System;
+
+using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Org.Apache.REEF.Tang.Types;
 
 namespace Org.Apache.REEF.Tang.Interface