cut down classes to be more dry