minor changes: make classes cls compliant