Doing a lot of cleanup and fixing JSON Parsing