Clean up math