Made kv more erlang-y