Refactor configs for clean up ...more todo..