De-sprawl math classes