Made JSON loading cleaner