KVP Clean Code