Early Refactoring 08

+formatting
+comments
+renamed variable