Tidying that up...