Early Refactoring 04

+renamed variable
+formatting
+comments