Core: Refactorization for Quality Management