Refactor config elements