Early Refactoring 06

+formatting
+comments