Refactoring a core.