Early Refactoring 09

+renamed variables
+formatting
+comments
+StyleCop clean