Refactoring dates

Using timestamp instead of ISOformat