Cleanup Commented Sections

Cleaned up template code and various tidbits from the SimpleXMLElement
version.