Cleaning up text and removing lots of commented-out stuff