Refactor
Implement KVP formatting for all({kvp:true}).

Update docs