little more cleaning, also

forgot to mention last commit attempted to clean up json but clearly i
formatted it really poorly