Tidying up a little