done refactoring out config