moved location of json file, cleaned up code a bit