Further tidying up.