refactors core
finishes refactoring core