Minor syntax cleanup.
Add KV object hook.
Rename function.