delete some old debugging code & reformat some things