Further tidying up