Quality

Corrected the last non-rule compliant classes.