Changed path for xml file
A little bit refactored code