Refactor conf