Cleaned up XML code