Updated KVP Clean Code