Refactoring the configuration into it's own struct