Make range_type editable; validate interfaces
Unrelated formatting alterations