Refactoring .date
Simplify a little