Refactored entirely RightTriangle, Circle