Updated content. Removed some commented out code.