removed some unnecessary stuff, did a little jsoning