refactor entity and xml_payload
Merge pull request #3 from fabianrbz/refactor

refactor entity and xml_payload