Core review & refactoring