Additional tidying