Class comment improved