10/04 Tidying up