Minor changes

code clean up and fixed error in json file that was displaying wrong
data.