Early Refactoring 03

+formatting
+comments