conf refactor