Cosmetic changes and added json pretty print