refactored config [skip ci]