Fixed whitespace and json formatting