enhancements: core methods refactored to improve performance and reduce overhead