checking in the benign parts of a big refactor

I am guessing that you don't want spacing to be changed to avoid further merge conflicts with rippled