Incorporate code review feedback - consolidate config.