refactored json and js files