Tidy
Rewritting math