Cleaned up math classes slightly.