More math refactorings r65