Refined the internal default config and clean up