* Updated example json dump with better case, and minor code refactoring