Cleaned up xml import code
Cleaned up xml import code