JSON files added. Code clean up.