Tidying up before you arrive