Tweaked class files