CJ's latest pull request for triangle facts style

Finally? fixed tabs to spaces and stuff.. yay
Redundant `self` detected.