cleaned out the comments and misunderstood stuff