Early Refactoring 02

+renaming
+formatting
+comments