IMPROVEMENT: refactor Core library