Early Refactoring 07

+formatting
+comments
+access modifiers