Continuation of RippleCalc refactoring.
Tiny changes.