final version(hopefully)

cleaned json