Swapped position of XML attributes
Cleaned up commented out lines