Further tidying.