date format fix and removing tax