Tidying up to make report nicer