[fix] use newclassstyle everywhere so super works as expected
[mod] trailing spaces