Clean and rename DateAndTime and UrlScraper