[Fix] RIPPLE-10

A small fix for RIPPLE-10, and a small cleanup commit.