Tidying up various bits