Few code refactorings
Improved JSON examples