Minor optimization

This helps improve startup time and reduces CORE.setting about 9KB