auto-generated file
code clean up
XML creation improved