Refactoring, extract configs