Refactor

Merging data into 1 xml and changing function names to be more Pythonic