Cleaned up some code, renamed json file