refactoring
refactor xml elements generation