Added missing comments, removed unused property.