Fixed style bugs and json formatting