Tidying

House-keeping.