Cleaner way to configure

(Logical change 1.33)
4 files changed