beautified the core source