Tidying up Willy