Cleaned up multiple points of entry for config creation.