tidy up core package