Initial tidying-up