minor
core: (wip) refactoring