Further tidying