reformat and pretty print (W.I.P)

reformat and pretty print (W.I.P) fixes #7