Tidying up the formatting