Data cleaner and timestamp generation working