Clean up on triangle
Merge pull request #1 from RobynSeverson/feature/clean-calc

Clean up on triangle
Merge pull request #2 from RobynSeverson/develop

clean up