Refactoring our Configuration Code