xml refactor + load