Triangles

Refactor Triangles according to last pull comments
This burns my eyes. Find a way to format the math such that it is legible. If that takes two or three lines to accomplish, that's probably ok.