Tidying up skeleton