finished refactoring Config