More comments on the class structure.