Tidying up core