Tidying is getting somewhere