refactor - getting clean JSON now