Futher tidying