Early Refactoring 05

+renamed variable
+formatting
+comments