Class beautified ...