Tried to make things more concistant (capitals, and
k/v => key/value)