Bit of config refactoring