Consolidated some configuration options.