Simplified JSON files and refactored JS