cleanup code
move loading into JsonLoader::load