Style cleanup.
Add support for nested json metadata.