minor refactor in core