Removed commented-out lines and unnecessary variables