simplifying the design and functionality of the core

simplifying the design and functionality of the core