Refactoring

+TimeStamps added
+General refactoring