Address review in #58

Two? I see only _customValueIndex without declaration (will add that).