tidying up, as Stuart would say...