Added some date formatting