Tidying bits and bobs