Trimmed the commented-out sections.