More tidying up.