Tidying up formatting and date