Early Refactoring 01

+variables renamed
+comments
+documentation updated