Not the most elegant solution, but better date formats