Simplify all the datetime stuff