added some thingy formatting and replaced eval with json parser