slight consolidation of configuration