Added support for string format in `_date()`
Code cleaning